6 files changed, 6 insertions, 11 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index ab7fcc4b39..2e4d9d039e 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -2302,10 +2302,10 @@ end
 
 module TkTreatItemFont
   def __conf_cmd(idx)
-    raise NotImplementError, "need to define `__conf_cmd'"
+    raise NotImplementedError, "need to define `__conf_cmd'"
   end
   def __item_pathname(tagOrId)
-    raise NotImplementError, "need to define `__item_pathname'"
+    raise NotImplementedError, "need to define `__item_pathname'"
   end
   private :__conf_cmd, :__item_pathname
 
diff --git a/lib/delegate.rb b/lib/delegate.rb
index 707bc2144b..08f730a532 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -48,7 +48,7 @@ class Delegator
   end
 
   def __getobj__
-    raise NotImplementError, "need to define `__getobj__'"
+    raise NotImplementedError, "need to define `__getobj__'"
   end
 
 end
diff --git a/lib/irb/input-method.rb b/lib/irb/input-method.rb
index 65a016fd07..ec834b17bc 100644
--- a/lib/irb/input-method.rb
+++ b/lib/irb/input-method.rb
@@ -28,7 +28,7 @@ module IRB
     attr_accessor :prompt
     
     def gets
-      IRB.fail NotImplementError, "gets"
+      IRB.fail NotImplementedError, "gets"
     end
     public :gets
 
diff --git a/lib/irb/lc/error.rb b/lib/irb/lc/error.rb
index 27d151f98f..68a488a48a 100644
--- a/lib/irb/lc/error.rb
+++ b/lib/irb/lc/error.rb
@@ -16,7 +16,7 @@ module IRB
   # exceptions
   extend Exception2MessageMapper
   def_exception :UnrecognizedSwitch, "Unrecognized switch: %s"
-  def_exception :NotImplementError, "Need to define `%s'"
+  def_exception :NotImplementedError, "Need to define `%s'"
   def_exception :CantReturnToNormalMode, "Can't return to normal mode."
   def_exception :IllegalParameter, "Illegal parameter(%s)."
   def_exception :IrbAlreadyDead, "Irb is already dead."
diff --git a/lib/irb/lc/ja/error.rb b/lib/irb/lc/ja/error.rb
index 42493554c6..e1afaf5d71 100644
--- a/lib/irb/lc/ja/error.rb
+++ b/lib/irb/lc/ja/error.rb
@@ -15,7 +15,7 @@ module IRB
   # exceptions
   extend Exception2MessageMapper
   def_exception :UnrecognizedSwitch, '$B%9%$%C%A(B(%s)$B$,J,$j$^$;$s(B'
-  def_exception :NotImplementError, '`%s\'$B$NDj5A$,I,MW$G$9(B'
+  def_exception :NotImplementedError, '`%s\'$B$NDj5A$,I,MW$G$9(B'
   def_exception :CantReturnToNormalMode, 'Normal$B%b!<%I$KLa$l$^$;$s(B.'
   def_exception :IllegalParameter, '$B%Q%i%a!<%?(B(%s)$B$,4V0c$C$F$$$^$9(B.'
   def_exception :IrbAlreadyDead, 'Irb$B$O4{$K;`$s$G$$$^$9(B.'
diff --git a/lib/racc/parser.rb b/lib/racc/parser.rb
index 25590fa228..ae7bec577a 100644
--- a/lib/racc/parser.rb
+++ b/lib/racc/parser.rb
@@ -13,11 +13,6 @@
 #   $Id$
 #
 
-unless defined? NotImplementedError then
-  NotImplementedError = NotImplementError
-end
-
-
 module Racc
   class ParseError < StandardError; end
 end