diff --git a/sugar/activity/activityfactoryservice.py b/sugar/activity/activityfactoryservice.py
index c10a50df..bd89b91d 100644
--- a/sugar/activity/activityfactoryservice.py
+++ b/sugar/activity/activityfactoryservice.py
@@ -157,7 +157,7 @@ def run(bundle_path):
 
     bundle = Bundle(bundle_path)
 
-    logger.start(bundle.get_name())
+    logger.start(bundle.get_service_name())
 
     gettext.bindtextdomain(bundle.get_service_name(),
                            bundle.get_locale_path())
diff --git a/sugar/logger.py b/sugar/logger.py
index de73d243..4fcc40d8 100644
--- a/sugar/logger.py
+++ b/sugar/logger.py
@@ -104,7 +104,7 @@ def _get_logs_dir():
 
 def start(module_id):
     # Only log if logging is set up for the activity
-    module_key = module_id.upper() + "_DEBUG"
+    module_key = module_id.replace('.', '_').upper() + "_DEBUG"
     if not os.environ.has_key(module_key) and not env.is_emulator():
         return