diff --git a/bin/heat-api-cfn b/bin/heat-api-cfn
index 2bf0caf08c..4535c45a6e 100755
--- a/bin/heat-api-cfn
+++ b/bin/heat-api-cfn
@@ -39,7 +39,7 @@ from heat.common import wsgi
 from heat.openstack.common import cfg
 from heat.openstack.common import log as logging
 
-LOG = logging.getLogger('heat.api')
+LOG = logging.getLogger('heat.api.cfn')
 
 if __name__ == '__main__':
     try:
diff --git a/etc/heat/heat-api-cfn-paste.ini b/etc/heat/heat-api-cfn-paste.ini
index e09404bff3..88df756934 100644
--- a/etc/heat/heat-api-cfn-paste.ini
+++ b/etc/heat/heat-api-cfn-paste.ini
@@ -45,7 +45,7 @@ pipeline = versionnegotiation ec2authtoken authtoken auth-context cache cacheman
 
 [app:apicfnv1app]
 paste.app_factory = heat.common.wsgi:app_factory
-heat.app_factory = heat.api.v1:API
+heat.app_factory = heat.api.cfn.v1:API
 
 [filter:versionnegotiation]
 paste.filter_factory = heat.common.wsgi:filter_factory
diff --git a/heat/api/aws/ec2token.py b/heat/api/aws/ec2token.py
index 58b8869bd5..4c4c0bff06 100644
--- a/heat/api/aws/ec2token.py
+++ b/heat/api/aws/ec2token.py
@@ -21,14 +21,13 @@ import gettext
 
 gettext.install('heat', unicode=1)
 
-from heat.api.v1 import stacks
 from heat.common import wsgi
 
 from webob import Request
 import webob
 from heat import utils
 from heat.common import context
-from heat.api.v1 import exception
+from heat.api.aws import exception
 
 from heat.openstack.common import log as logging
 
diff --git a/heat/api/cfn/__init__.py b/heat/api/cfn/__init__.py
new file mode 100644
index 0000000000..e8e4035941
--- /dev/null
+++ b/heat/api/cfn/__init__.py
@@ -0,0 +1,14 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
diff --git a/heat/api/v1/__init__.py b/heat/api/cfn/v1/__init__.py
similarity index 96%
rename from heat/api/v1/__init__.py
rename to heat/api/cfn/v1/__init__.py
index 9ea96535d2..cf7c2cd2f8 100644
--- a/heat/api/v1/__init__.py
+++ b/heat/api/cfn/v1/__init__.py
@@ -21,7 +21,7 @@ import gettext
 
 gettext.install('heat', unicode=1)
 
-from heat.api.v1 import stacks
+from heat.api.cfn.v1 import stacks
 from heat.common import wsgi
 
 from webob import Request
@@ -38,7 +38,7 @@ logger = logging.getLogger(__name__)
 class API(wsgi.Router):
 
     """
-    WSGI router for Heat v1 API requests.
+    WSGI router for Heat CloudFormation v1 API requests.
     """
 
     _actions = {
diff --git a/heat/api/v1/stacks.py b/heat/api/cfn/v1/stacks.py
similarity index 99%
rename from heat/api/v1/stacks.py
rename to heat/api/cfn/v1/stacks.py
index a74f287952..8218d2c39f 100644
--- a/heat/api/v1/stacks.py
+++ b/heat/api/cfn/v1/stacks.py
@@ -14,8 +14,9 @@
 #    under the License.
 
 """
-/stack endpoint for heat v1 API
+Stack endpoint for Heat CloudFormation v1 API.
 """
+
 import httplib
 import json
 import os
@@ -37,13 +38,13 @@ from heat.openstack.common import rpc
 import heat.openstack.common.rpc.common as rpc_common
 from heat.openstack.common import log as logging
 
-logger = logging.getLogger('heat.api.v1.stacks')
+logger = logging.getLogger('heat.api.cfn.v1.stacks')
 
 
 class StackController(object):
 
     """
-    WSGI controller for stacks resource in heat v1 API
+    WSGI controller for stacks resource in Heat CloudFormation v1 API
     Implements the API actions
     """
 
diff --git a/heat/common/wsgi.py b/heat/common/wsgi.py
index 0a56618813..11d990a13c 100644
--- a/heat/common/wsgi.py
+++ b/heat/common/wsgi.py
@@ -666,7 +666,7 @@ class AppFactory(BasePasteFactory):
 
       [app:apiv1app]
       paste.app_factory = heat.common.wsgi:app_factory
-      heat.app_factory = heat.api.v1:API
+      heat.app_factory = heat.api.cfn.v1:API
 
     The WSGI app constructor must accept a ConfigOpts object and a local config
     dict as its two arguments.
diff --git a/heat/tests/test_api_cfn_v1.py b/heat/tests/test_api_cfn_v1.py
index 0f9a127e8e..ac81fe00b5 100644
--- a/heat/tests/test_api_cfn_v1.py
+++ b/heat/tests/test_api_cfn_v1.py
@@ -34,7 +34,7 @@ from heat.openstack.common import rpc
 import heat.openstack.common.rpc.common as rpc_common
 from heat.common.wsgi import Request
 from heat.api.aws import exception
-import heat.api.v1.stacks as stacks
+import heat.api.cfn.v1.stacks as stacks
 
 
 @attr(tag=['unit', 'api-cfn-v1-stacks', 'StackController'])