diff --git a/contest.gemspec b/contest.gemspec
index 041d1dd..a1a121f 100644
--- a/contest.gemspec
+++ b/contest.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'contest'
-  s.version = '0.0.3'
+  s.version = '0.0.4'
   s.summary = %{Contexts for Test::Unit}
   s.date = %q{2009-03-16}
   s.author = "Damian Janowski"
diff --git a/contest.gemspec.erb b/contest.gemspec.erb
index 28c0d80..48ad615 100644
--- a/contest.gemspec.erb
+++ b/contest.gemspec.erb
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'contest'
-  s.version = '0.0.3'
+  s.version = '0.0.4'
   s.summary = %{Contexts for Test::Unit}
   s.date = %q{2009-03-16}
   s.author = "Damian Janowski"
diff --git a/lib/contest.rb b/lib/contest.rb
index 2cfcbf5..5f2402a 100644
--- a/lib/contest.rb
+++ b/lib/contest.rb
@@ -44,10 +44,14 @@ def self.setup_blocks
   end
 
   def self.context_name(name)
-    "#{name.gsub(/(^| )(\w)/) { $2.upcase }}Test".to_sym
+    "Test#{sanitize_name(name).gsub(/(^| )(\w)/) { $2.upcase }}".to_sym
   end
 
   def self.test_name(name)
-    "test_#{name.gsub(/\s+/,'_')}".to_sym
+    "test_#{sanitize_name(name).gsub(/\s+/,'_')}".to_sym
+  end
+
+  def self.sanitize_name(name)
+    name.gsub(/\W+/, ' ')
   end
 end
diff --git a/test/all_test.rb b/test/all_test.rb
index 75d3117..bfe755a 100644
--- a/test/all_test.rb
+++ b/test/all_test.rb
@@ -9,6 +9,9 @@ class FooTest < Test::Unit::TestCase
     assert_equal 1, @value
   end
 
+  context "context's non-word characters" do
+  end
+
   context "some context" do
     setup do
       @value += 1