diff --git a/bitbake/ChangeLog b/bitbake/ChangeLog
index 62be6ea126..561b618ae4 100644
--- a/bitbake/ChangeLog
+++ b/bitbake/ChangeLog
@@ -41,6 +41,7 @@ Changes in BitBake 1.8.x:
 	- Add PERSISTENT_DIR to store the PersistData in a persistent
 	  directory != the cache dir.
 	- Add md5 and sha256 checksum generation functions to utils.py
+	- Revert the '-' character fix in class names since it breaks things
 
 Changes in BitBake 1.8.10:
 	- Psyco is available only for x86 - do not use it on other architectures.
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index 764def8ec0..d7bf6d4f37 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -93,7 +93,7 @@ def handle(fn, d, include = 0):
     init(d)
 
     if ext == ".bbclass":
-        __classname__ = root.replace('-','_')
+        __classname__ = root
         classes.append(__classname__)
         __inherit_cache = data.getVar('__inherit_cache', d) or []
         if not fn in __inherit_cache:
@@ -247,7 +247,7 @@ def feeder(lineno, s, fn, root, d):
 
     m = __func_start_regexp__.match(s)
     if m:
-        __infunc__ = (m.group("func") or "__anonymous").replace('-','_')
+        __infunc__ = m.group("func") or "__anonymous"
         key = __infunc__
         if data.getVar(key, d):
 #           clean up old version of this piece of metadata, as its