diff --git a/platformio/debug/config/factory.py b/platformio/debug/config/factory.py
index d74dad38..6f9342ed 100644
--- a/platformio/debug/config/factory.py
+++ b/platformio/debug/config/factory.py
@@ -23,7 +23,7 @@ class DebugConfigFactory(object):
     @staticmethod
     def get_clsname(name):
         name = re.sub(r"[^\da-z\_\-]+", "", name, flags=re.I)
-        return "%s%sDebugConfig" % (name.upper()[0], name.lower()[1:])
+        return "%sDebugConfig" % name.lower().title()
 
     @classmethod
     def new(cls, platform, project_config, env_name):
diff --git a/platformio/platform/factory.py b/platformio/platform/factory.py
index db51a5d5..91fb8c9f 100644
--- a/platformio/platform/factory.py
+++ b/platformio/platform/factory.py
@@ -26,7 +26,7 @@ class PlatformFactory(object):
     @staticmethod
     def get_clsname(name):
         name = re.sub(r"[^\da-z\_]+", "", name, flags=re.I)
-        return "%s%sPlatform" % (name.upper()[0], name.lower()[1:])
+        return "%sPlatform" % name.lower().title()
 
     @staticmethod
     def load_module(name, path):