diff --git a/build/lib/ExportMap.js b/build/lib/ExportMap.js
index 2199ae3..b2cdc8c 100644
--- a/build/lib/ExportMap.js
+++ b/build/lib/ExportMap.js
@@ -18,10 +18,10 @@ class ExportMap {
         const entryName = `${scope ? scope + "." : ""}${message.getName()}`;
         this.messageMap[entryName] = messageEntry;
         message.getNestedTypeList().forEach(nested => {
-            this.exportNested(scope + "." + message.getName(), fileDescriptor, nested);
+            this.exportNested(entryName, fileDescriptor, nested);
         });
         message.getEnumTypeList().forEach(enumType => {
-            const identifier = scope + "." + message.getName() + "." + enumType.getName();
+            const identifier = entryName + "." + enumType.getName();
             this.enumMap[identifier] = {
                 pkg: fileDescriptor.getPackage(),
                 fileName: fileDescriptor.getName(),
@@ -35,7 +35,8 @@ class ExportMap {
             this.exportNested(scope, fileDescriptor, messageType);
         });
         fileDescriptor.getEnumTypeList().forEach(enumType => {
-            this.enumMap[scope + "." + enumType.getName()] = {
+            const entryName = `${scope ? scope + "." : ""}${enumType.getName()}`;
+            this.enumMap[entryName] = {
                 pkg: fileDescriptor.getPackage(),
                 fileName: fileDescriptor.getName(),
                 enumOptions: enumType.getOptions(),
diff --git a/build/lib/ExportMap.js.map b/build/lib/ExportMap.js.map
index c6c8c8e..d6414ec 100644
--- a/build/lib/ExportMap.js.map
+++ b/build/lib/ExportMap.js.map
@@ -1 +1 @@
-{"version":3,"file":"ExportMap.js","sourceRoot":"","sources":["../../src/lib/ExportMap.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"ExportMap.js","sourceRoot":"","sources":["../../src/lib/ExportMap.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/src/lib/ExportMap.ts b/src/lib/ExportMap.ts
index 0cf12cf..f2e6acb 100644
--- a/src/lib/ExportMap.ts
+++ b/src/lib/ExportMap.ts
@@ -43,11 +43,11 @@ export class ExportMap {
         this.messageMap[entryName] = messageEntry;
 
         message.getNestedTypeList().forEach(nested => {
-            this.exportNested(scope + "." + message.getName(), fileDescriptor, nested);
+            this.exportNested(entryName, fileDescriptor, nested);
         });
 
         message.getEnumTypeList().forEach(enumType => {
-            const identifier = scope + "." + message.getName() + "." + enumType.getName();
+            const identifier = entryName + "." + enumType.getName();
             this.enumMap[identifier] = {
                 pkg: fileDescriptor.getPackage(),
                 fileName: fileDescriptor.getName(),
@@ -63,7 +63,8 @@ export class ExportMap {
         });
 
         fileDescriptor.getEnumTypeList().forEach(enumType => {
-            this.enumMap[scope + "." + enumType.getName()] = {
+            const entryName = `${scope ? scope + "." : ""}${enumType.getName()}`;
+            this.enumMap[entryName] = {
                 pkg: fileDescriptor.getPackage(),
                 fileName: fileDescriptor.getName(),
                 enumOptions: enumType.getOptions(),