6 files changed, 12 insertions, 12 deletions
diff --git a/spec/ruby/library/date/constants_spec.rb b/spec/ruby/library/date/constants_spec.rb
index fc1dba4999..1d18dd1b0c 100644
--- a/spec/ruby/library/date/constants_spec.rb
+++ b/spec/ruby/library/date/constants_spec.rb
@@ -36,11 +36,11 @@ describe "Date constants" do
     [Date::MONTHNAMES, Date::DAYNAMES, Date::ABBR_MONTHNAMES, Date::ABBR_DAYNAMES].each do |ary|
       -> {
         ary << "Unknown"
-      }.should raise_error(frozen_error_class, /frozen/)
+      }.should raise_error(FrozenError, /frozen/)
       ary.compact.each do |name|
         -> {
           name << "modified"
-        }.should raise_error(frozen_error_class, /frozen/)
+        }.should raise_error(FrozenError, /frozen/)
       end
     end
   end
diff --git a/spec/ruby/library/set/compare_by_identity_spec.rb b/spec/ruby/library/set/compare_by_identity_spec.rb
index a6ad794ad3..28fe91309f 100644
--- a/spec/ruby/library/set/compare_by_identity_spec.rb
+++ b/spec/ruby/library/set/compare_by_identity_spec.rb
@@ -91,11 +91,11 @@ describe "Set#compare_by_identity" do
     set.to_a.sort.should == [a1, a2].sort
   end
 
-  it "raises a #{frozen_error_class} on frozen sets" do
+  it "raises a FrozenError on frozen sets" do
     set = Set.new.freeze
     -> {
       set.compare_by_identity
-    }.should raise_error(frozen_error_class, /frozen Hash/)
+    }.should raise_error(FrozenError, /frozen Hash/)
   end
 
   it "persists over #dups" do
diff --git a/spec/ruby/library/stringio/initialize_spec.rb b/spec/ruby/library/stringio/initialize_spec.rb
index 7b141caedc..1e8096e3bb 100644
--- a/spec/ruby/library/stringio/initialize_spec.rb
+++ b/spec/ruby/library/stringio/initialize_spec.rb
@@ -110,9 +110,9 @@ describe "StringIO#initialize when passed [Object, mode]" do
     io.closed_write?.should be_false
   end
 
-  it "raises a #{frozen_error_class} when passed a frozen String in truncate mode as StringIO backend" do
+  it "raises a FrozenError when passed a frozen String in truncate mode as StringIO backend" do
     io = StringIO.allocate
-    -> { io.send(:initialize, "example".freeze, IO::TRUNC) }.should raise_error(frozen_error_class)
+    -> { io.send(:initialize, "example".freeze, IO::TRUNC) }.should raise_error(FrozenError)
   end
 
   it "tries to convert the passed mode to a String using #to_str" do
diff --git a/spec/ruby/library/stringio/open_spec.rb b/spec/ruby/library/stringio/open_spec.rb
index adb784c890..acab6e9056 100644
--- a/spec/ruby/library/stringio/open_spec.rb
+++ b/spec/ruby/library/stringio/open_spec.rb
@@ -134,8 +134,8 @@ describe "StringIO.open when passed [Object, mode]" do
     io.closed_write?.should be_false
   end
 
-  it "raises a #{frozen_error_class} when passed a frozen String in truncate mode as StringIO backend" do
-    -> { StringIO.open("example".freeze, IO::TRUNC) }.should raise_error(frozen_error_class)
+  it "raises a FrozenError when passed a frozen String in truncate mode as StringIO backend" do
+    -> { StringIO.open("example".freeze, IO::TRUNC) }.should raise_error(FrozenError)
   end
 
   it "tries to convert the passed mode to a String using #to_str" do
diff --git a/spec/ruby/library/stringio/reopen_spec.rb b/spec/ruby/library/stringio/reopen_spec.rb
index 64fd0a8c02..ab0a3331d2 100644
--- a/spec/ruby/library/stringio/reopen_spec.rb
+++ b/spec/ruby/library/stringio/reopen_spec.rb
@@ -50,8 +50,8 @@ describe "StringIO#reopen when passed [Object, Integer]" do
     -> { @io.reopen("burn".freeze, IO::WRONLY | IO::APPEND) }.should raise_error(Errno::EACCES)
   end
 
-  it "raises a #{frozen_error_class} when trying to reopen self with a frozen String in truncate-mode" do
-    -> { @io.reopen("burn".freeze, IO::RDONLY | IO::TRUNC) }.should raise_error(frozen_error_class)
+  it "raises a FrozenError when trying to reopen self with a frozen String in truncate-mode" do
+    -> { @io.reopen("burn".freeze, IO::RDONLY | IO::TRUNC) }.should raise_error(FrozenError)
   end
 
   it "does not raise IOError when passed a frozen String in read-mode" do
diff --git a/spec/ruby/library/stringio/shared/read.rb b/spec/ruby/library/stringio/shared/read.rb
index 15ce58ae6a..c60677bba7 100644
--- a/spec/ruby/library/stringio/shared/read.rb
+++ b/spec/ruby/library/stringio/shared/read.rb
@@ -27,8 +27,8 @@ describe :stringio_read, shared: true do
     -> { @io.send(@method, 7, Object.new) }.should raise_error(TypeError)
   end
 
-  it "raises a #{frozen_error_class} error when passed a frozen String as buffer" do
-    -> { @io.send(@method, 7, "".freeze) }.should raise_error(frozen_error_class)
+  it "raises a FrozenError error when passed a frozen String as buffer" do
+    -> { @io.send(@method, 7, "".freeze) }.should raise_error(FrozenError)
   end
 end