diff --git a/dbt/adapters/bigquery/impl.py b/dbt/adapters/bigquery/impl.py
index 75fa83f188a..660e5127f21 100644
--- a/dbt/adapters/bigquery/impl.py
+++ b/dbt/adapters/bigquery/impl.py
@@ -28,7 +28,7 @@
 
 class BigQueryAdapter(PostgresAdapter):
 
-    context_functions = [
+    config_functions = [
         # deprecated -- use versions that take relations instead
         "query_for_existing",
         "execute_model",
@@ -51,7 +51,10 @@ class BigQueryAdapter(PostgresAdapter):
         "drop_relation",
         "rename_relation",
 
-        "get_columns_in_table"
+        "get_columns_in_table",
+
+        # formerly profile functions
+        "add_query",
     ]
 
     SCOPE = ('https://www.googleapis.com/auth/bigquery',
diff --git a/dbt/adapters/default/impl.py b/dbt/adapters/default/impl.py
index 3a879ec36de..8fe29e4a684 100644
--- a/dbt/adapters/default/impl.py
+++ b/dbt/adapters/default/impl.py
@@ -52,7 +52,7 @@ def test(row):
 class DefaultAdapter(object):
     requires = {}
 
-    context_functions = [
+    config_functions = [
         "get_columns_in_table",
         "get_missing_columns",
         "expand_target_column_types",
@@ -75,9 +75,8 @@ class DefaultAdapter(object):
         "drop_relation",
         "rename_relation",
         "truncate_relation",
-    ]
 
-    profile_functions = [
+        # formerly profile functions
         "execute",
         "add_query",
     ]
diff --git a/dbt/context/common.py b/dbt/context/common.py
index 917747d08f6..0c5dbc23ff6 100644
--- a/dbt/context/common.py
+++ b/dbt/context/common.py
@@ -51,9 +51,8 @@ def __init__(self, model, adapter):
         self.adapter = adapter
         self.Relation = RelationProxy(adapter)
 
-        # TODO: clean up this part of the adapter classes
         self._wrapped = frozenset(
-            self.adapter.context_functions + self.adapter.profile_functions
+            self.adapter.config_functions
         )
         self._proxied = frozenset(self.adapter.raw_functions)