diff --git a/heat/db/sqlalchemy/session.py b/heat/db/sqlalchemy/session.py
index 70988f6bf9..caa9fecaa5 100644
--- a/heat/db/sqlalchemy/session.py
+++ b/heat/db/sqlalchemy/session.py
@@ -22,7 +22,7 @@ from sqlalchemy.exc import DisconnectionError
 from heat.db import api as db_api
 from heat.openstack.common import cfg
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger('heat.db.sqlalchemy.session')
 _ENGINE = None
 _MAKER = None
 
diff --git a/heat/engine/checkeddict.py b/heat/engine/checkeddict.py
index ad154b1063..ec9c6fe35b 100644
--- a/heat/engine/checkeddict.py
+++ b/heat/engine/checkeddict.py
@@ -17,7 +17,7 @@ import collections
 import re
 import logging
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger('heat.engine.checkeddict')
 
 
 class CheckedDict(collections.MutableMapping):
diff --git a/heat/engine/eip.py b/heat/engine/eip.py
index dd7f21d518..ed5f47ad29 100644
--- a/heat/engine/eip.py
+++ b/heat/engine/eip.py
@@ -18,7 +18,7 @@ import logging
 from heat.common import exception
 from heat.engine.resources import Resource
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger('heat.engine.eip')
 
 
 class ElasticIp(Resource):
diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index 0041bd8ccc..5e721ffea9 100644
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -22,7 +22,7 @@ from heat.engine import checkeddict
 from heat.engine.resources import Resource
 from heat.db import api as db_api
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger('heat.engine.parser')
 
 
 class Stack(object):
diff --git a/heat/engine/resources.py b/heat/engine/resources.py
index cac26d45f8..2a2d12f6d9 100644
--- a/heat/engine/resources.py
+++ b/heat/engine/resources.py
@@ -26,7 +26,7 @@ from heat.common.config import HeatEngineConfigOpts
 from heat.db import api as db_api
 from heat.engine import checkeddict
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger('heat.engine.resources')
 
 
 class Resource(object):
diff --git a/heat/engine/security_group.py b/heat/engine/security_group.py
index 87f1edf908..7939bb920e 100644
--- a/heat/engine/security_group.py
+++ b/heat/engine/security_group.py
@@ -19,7 +19,7 @@ from novaclient.exceptions import NotFound
 from heat.common import exception
 from heat.engine.resources import Resource
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger('heat.engine.security_group')
 
 
 class SecurityGroup(Resource):
diff --git a/heat/engine/user.py b/heat/engine/user.py
index c77205b524..58e64a80a5 100644
--- a/heat/engine/user.py
+++ b/heat/engine/user.py
@@ -18,7 +18,7 @@ from novaclient.exceptions import BadRequest
 from heat.common import exception
 from heat.engine.resources import Resource
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger('heat.engine.user')
 
 
 class User(Resource):
diff --git a/heat/engine/volume.py b/heat/engine/volume.py
index c6be165d80..7c61892c0f 100644
--- a/heat/engine/volume.py
+++ b/heat/engine/volume.py
@@ -20,7 +20,7 @@ import re
 from heat.common import exception
 from heat.engine.resources import Resource
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger('heat.engine.volume')
 
 
 class Volume(Resource):