diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b6ed18..e8378c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,8 +71,8 @@ SET(LIBRARY_SOURCES
 
 SET(LIBRARY_HEADERS
 	SDL2pp/Audio.hh
+	SDL2pp/ContainerRWops.hh
 	SDL2pp/Exception.hh
-	SDL2pp/ExtraRWops.hh
 	SDL2pp/Point.hh
 	SDL2pp/RWops.hh
 	SDL2pp/Rect.hh
diff --git a/SDL2pp/ExtraRWops.hh b/SDL2pp/ContainerRWops.hh
similarity index 98%
rename from SDL2pp/ExtraRWops.hh
rename to SDL2pp/ContainerRWops.hh
index ef13e77..bf49afe 100644
--- a/SDL2pp/ExtraRWops.hh
+++ b/SDL2pp/ContainerRWops.hh
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SDL2PP_EXTRARWOPS_HH
-#define SDL2PP_EXTRARWOPS_HH
+#ifndef SDL2PP_CONTAINERRWOPS_HH
+#define SDL2PP_CONTAINERRWOPS_HH
 
 #include <SDL2pp/RWops.hh>
 
diff --git a/SDL2pp/SDL2pp.hh b/SDL2pp/SDL2pp.hh
index cc940b1..0834df9 100644
--- a/SDL2pp/SDL2pp.hh
+++ b/SDL2pp/SDL2pp.hh
@@ -33,7 +33,7 @@
 #include <SDL2pp/Rect.hh>
 #include <SDL2pp/Point.hh>
 #include <SDL2pp/RWops.hh>
-#include <SDL2pp/ExtraRWops.hh>
+#include <SDL2pp/ContainerRWops.hh>
 #include <SDL2pp/Wav.hh>
 
 #endif
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d2811b1..8c3b9f6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(HEADER_TESTS
 	header_rect
 	header_renderer
 	header_rwops
-	header_extrarwops
+	header_containerrwops
 	header_sdl
 	header_sdl2pp
 	header_texture
diff --git a/tests/header_containerrwops.cc b/tests/header_containerrwops.cc
new file mode 100644
index 0000000..ea400b7
--- /dev/null
+++ b/tests/header_containerrwops.cc
@@ -0,0 +1,5 @@
+#include <SDL2pp/ContainerRWops.hh>
+
+int main() {
+	return 0;
+}
diff --git a/tests/header_extrarwops.cc b/tests/header_extrarwops.cc
deleted file mode 100644
index d038838..0000000
--- a/tests/header_extrarwops.cc
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <SDL2pp/ExtraRWops.hh>
-
-int main() {
-	return 0;
-}
diff --git a/tests/test_rwops.cc b/tests/test_rwops.cc
index 578b459..bd766df 100644
--- a/tests/test_rwops.cc
+++ b/tests/test_rwops.cc
@@ -1,7 +1,7 @@
 #include <vector>
 
 #include <SDL2pp/Exception.hh>
-#include <SDL2pp/ExtraRWops.hh>
+#include <SDL2pp/ContainerRWops.hh>
 #include <SDL2pp/RWops.hh>
 
 #include "testing.h"