diff --git a/lib/cmock_generator.rb b/lib/cmock_generator.rb
index 874bce7..00d6d92 100644
--- a/lib/cmock_generator.rb
+++ b/lib/cmock_generator.rb
@@ -5,6 +5,7 @@
 # ==========================================
 
 $here = File.dirname __FILE__
+require "#{$here}/../vendor/unity/auto/type_sanitizer"
 
 class CMockGenerator
 
@@ -28,7 +29,7 @@ class CMockGenerator
   def create_mock(module_name, parsed_stuff)
     @module_name = module_name
     @mock_name   = @prefix + @module_name
-    @clean_mock_name = @mock_name.gsub(/(?:-|\.\s+)/, "_")
+    @clean_mock_name = TypeSanitizer.sanitize_c_identifier(@mock_name)
     create_mock_header_file(parsed_stuff)
     create_mock_source_file(parsed_stuff)
   end
@@ -63,7 +64,7 @@ class CMockGenerator
   end
 
   def create_mock_header_header(file, filename)
-    define_name   = @clean_mock_name.gsub(/[-\/\\\.\,\s]+/,'_').upcase
+    define_name   = @clean_mock_name.upcase
     orig_filename = filename[@config.mock_prefix.size..-1]
     file << "/* AUTOGENERATED FILE. DO NOT EDIT. */\n"
     file << "#ifndef _#{define_name}_H\n"
diff --git a/release/version.info b/release/version.info
index ee0c500..c52f96a 100644
--- a/release/version.info
+++ b/release/version.info
@@ -1,2 +1,2 @@
-2.1
+2.3
 
diff --git a/vendor/unity b/vendor/unity
index 891775d..89b003e 160000
--- a/vendor/unity
+++ b/vendor/unity
@@ -1 +1 @@
-Subproject commit 891775de38fc96173691e5c33bdea64872bfcc31
+Subproject commit 89b003ed0bb0ef1d80c072907dff24c7a1a4f004