diff --git a/lib/cmock_generator.rb b/lib/cmock_generator.rb
index 6b6f37d..b0dcf26 100644
--- a/lib/cmock_generator.rb
+++ b/lib/cmock_generator.rb
@@ -49,7 +49,7 @@ class CMockGenerator
   
   def create_mock_header_header(file, filename) 
     define_name   = filename.gsub(/\.h/, "_h").upcase
-    orig_filename = filename.gsub("Mock", "")   
+    orig_filename = filename.gsub(@config.mock_prefix, "")   
     file << "/* AUTOGENERATED FILE. DO NOT EDIT. */\n"
     file << "#ifndef _#{define_name}\n"
     file << "#define _#{define_name}\n\n"
diff --git a/test/unit/cmock_generator_main_test.rb b/test/unit/cmock_generator_main_test.rb
index 0b47936..581225f 100644
--- a/test/unit/cmock_generator_main_test.rb
+++ b/test/unit/cmock_generator_main_test.rb
@@ -58,6 +58,7 @@ class CMockGeneratorTest < Test::Unit::TestCase
   end
   
   should "create the top of a header file" do
+    @config.expect.mock_prefix.returns("Mock")
     orig_filename = "PoutPoutFish.h"
     define_name = "MOCKPOUTPOUTFISH_H"
     mock_name = "MockPoutPoutFish"