diff --git a/README.md b/README.md
index ef8842d..e973cca 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,6 @@
 2. Supports both one way and server side streaming gRPC calls.
 3. POJO request construction guarded by message type definitions, which is way easier compare to `grpc-web`.
 4. No need to use swagger/open api to generate client code for the web.
-5. Fixes inconsistent field naming when fields contain numbers, e.g. `k8s_field` --> `k8sField`.
 
 ### Changes made since the fork
 
@@ -20,6 +19,8 @@
 3. Support for proto3 optional fields
 4. Updated to satisfy strict TS and eslint checks
 5. Generator options managed through standard flags
+6. Fixes inconsistent field naming when fields contain numbers, e.g. `k8s_field` --> `k8sField`
+7. Fixes module names when they contain dots or dashes
 
 ## Getting Started:
 
diff --git a/data/file.go b/data/file.go
index f81817b..9bab030 100644
--- a/data/file.go
+++ b/data/file.go
@@ -5,6 +5,8 @@ import (
 	"path/filepath"
 	"sort"
 	"strings"
+
+	"github.com/iancoleman/strcase"
 )
 
 // File store the information about rendering a file
@@ -95,20 +97,16 @@ type Dependency struct {
 	SourceFile string
 }
 
-// GetModuleName returns module name = package name + file name to be the unique identifier for source file in a ts file
+// GetModuleName returns module name = package name + base file name to be the
+// unique identifier for source file in a ts file. Package name and base file
+// name are converted to camel case, special characters like dot, dash and
+// underscore are removed.
 func GetModuleName(packageName, fileName string) string {
 	baseName := filepath.Base(fileName)
 	ext := filepath.Ext(fileName)
 	name := baseName[0 : len(baseName)-len(ext)]
-	packageParts := strings.Split(packageName, ".")
-
-	if packageName != "" {
-		for i, p := range packageParts {
-			packageParts[i] = strings.ToUpper(p[:1]) + p[1:]
-		}
-	}
 
-	return strings.Join(packageParts, "") + strings.ToUpper(name[:1]) + name[1:]
+	return strcase.ToCamel(packageName) + strcase.ToCamel(name)
 }
 
 // GetTSFileName gets the typescript filename out of the proto file name
diff --git a/data/file_test.go b/data/file_test.go
new file mode 100644
index 0000000..e9beebe
--- /dev/null
+++ b/data/file_test.go
@@ -0,0 +1,27 @@
+package data
+
+import "testing"
+
+func TestGetModuleName(t *testing.T) {
+	tests := []struct {
+		name        string
+		packageName string
+		fileName    string
+		want        string
+	}{
+		{"empty", "", "", ""},
+		{"simple", "mypackage", "service.proto", "MypackageService"},
+		{"with file path", "mypackage", "path/to/proto/file/service.proto", "MypackageService"},
+		{"with underscore", "my_package", "cool_service.proto", "MyPackageCoolService"},
+		{"with dash", "my-package", "cool-service.proto", "MyPackageCoolService"},
+		{"with dash and underscore", "my-package", "cool_service.proto", "MyPackageCoolService"},
+		{"with dots", "my.package", "cool.service.proto", "MyPackageCoolService"},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := GetModuleName(tt.packageName, tt.fileName); got != tt.want {
+				t.Errorf("GetModuleName() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
diff --git a/registry/registry.go b/registry/registry.go
index dd37dfa..8115140 100644
--- a/registry/registry.go
+++ b/registry/registry.go
@@ -310,7 +310,7 @@ func (r *Registry) collectExternalDependenciesFromData(filesData map[string]*dat
 
 			if _, ok := dependencies[identifier]; !ok {
 				// only fill in if this file has not been mentioned before.
-				// the way import in the genrated file works is like
+				// the way import in the generated file works is like
 				// import * as [ModuleIdentifier] from '[Source File]'
 				// so there only needs to be added once.
 				// Referencing types will be [ModuleIdentifier].[PackageIdentifier]