diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@
 protobuf-net (C#).
 
 
-## Other implementations
+## Other Implementations
 
 There are currently multiple Protocol Buffers implementations available. This
 library was created for the following reasons. Firstly, I wanted to use
diff --git a/protobuf-simple.cabal b/protobuf-simple.cabal
--- a/protobuf-simple.cabal
+++ b/protobuf-simple.cabal
@@ -3,7 +3,7 @@
 
 name:                protobuf-simple
 synopsis:            Simple Protocol Buffers library (proto2)
-version:             0.1.0.1
+version:             0.1.0.2
 homepage:            https://github.com/sru-systems/protobuf-simple
 license:             MIT
 license-file:        LICENSE
diff --git a/src/Parser/Generator.hs b/src/Parser/Generator.hs
--- a/src/Parser/Generator.hs
+++ b/src/Parser/Generator.hs
@@ -133,14 +133,9 @@
 
 
 getFullEnumName :: FileDesc -> EnumDesc -> String
-getFullEnumName fd ed = case FileDesc.getPackage fd of
-    Just val -> val ++ "." ++ name
-    Nothing  -> name
-  where name = EnumDesc.getName ed
+getFullEnumName fd ed = (getNamespace fd) ++ "." ++ (EnumDesc.getName ed)
 
 
 getFullMessageName :: FileDesc -> MessageDesc -> String
-getFullMessageName fd md = case FileDesc.getPackage fd of
-    Just val -> val ++ "." ++ name
-    Nothing  -> name
-  where name = MessageDesc.getName md
+getFullMessageName fd md = (getNamespace fd) ++ "." ++ (MessageDesc.getName md)
+