3 files changed, 7 insertions, 7 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index 31fc9ae1e..0430f053b 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -463,7 +463,7 @@ class DefaultCompiler(engine.Compiled):
             not isinstance(column.table, sql.Select):
             return _CompileLabel(column, sql._generated_label(column.name))
         elif not isinstance(column, (sql._UnaryExpression, sql._TextClause, sql._BindParamClause)) \
-                and (not hasattr(column, 'name') or isinstance(column, sql._Function)):
+                and (not hasattr(column, 'name') or isinstance(column, sql.Function)):
             return _CompileLabel(column, column.anon_label)
         else:
             return column
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 07df207dd..7204e2956 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -820,12 +820,12 @@ def text(text, bind=None, *args, **kwargs):
     return _TextClause(text, bind=bind, *args, **kwargs)
 
 def null():
-    """Return a ``_Null`` object, which compiles to ``NULL`` in a sql statement."""
+    """Return a :class:`_Null` object, which compiles to ``NULL`` in a sql statement."""
 
     return _Null()
 
 class _FunctionGenerator(object):
-    """Generate ``_Function`` objects based on getattr calls."""
+    """Generate :class:`Function` objects based on getattr calls."""
 
     def __init__(self, **opts):
         self.__names = []
@@ -856,7 +856,7 @@ class _FunctionGenerator(object):
             if func is not None:
                 return func(*c, **o)
 
-        return _Function(self.__names[-1], packagenames=self.__names[0:-1], *c, **o)
+        return Function(self.__names[-1], packagenames=self.__names[0:-1], *c, **o)
 
 # "func" global - i.e. func.count()
 func = _FunctionGenerator()
@@ -2228,7 +2228,7 @@ class _CalculatedClause(ColumnElement):
     def _compare_type(self, obj):
         return self.type
 
-class _Function(_CalculatedClause, FromClause):
+class Function(_CalculatedClause, FromClause):
     """Describe a SQL function.
 
     Extends ``_CalculatedClause``, turn the *clauselist* into function
diff --git a/lib/sqlalchemy/sql/functions.py b/lib/sqlalchemy/sql/functions.py
index b57b242f5..1bcc6d864 100644
--- a/lib/sqlalchemy/sql/functions.py
+++ b/lib/sqlalchemy/sql/functions.py
@@ -1,6 +1,6 @@
 from sqlalchemy import types as sqltypes
 from sqlalchemy.sql.expression import (
-    ClauseList, _Function, _literal_as_binds, text
+    ClauseList, Function, _literal_as_binds, text
     )
 from sqlalchemy.sql import operators
 from sqlalchemy.sql.visitors import VisitableType
@@ -10,7 +10,7 @@ class _GenericMeta(VisitableType):
         args = [_literal_as_binds(c) for c in args]
         return type.__call__(self, *args, **kwargs)
 
-class GenericFunction(_Function):
+class GenericFunction(Function):
     __metaclass__ = _GenericMeta
 
     def __init__(self, type_=None, group=True, args=(), **kwargs):