diff --git a/graphics/tinygl/README.residualvm b/graphics/tinygl/README.residualvm
index 6bdcff89a4b..0414de1321b 100644
--- a/graphics/tinygl/README.residualvm
+++ b/graphics/tinygl/README.residualvm
@@ -1,8 +1,8 @@
-This is a modified version of TinyGL 0.4 intended for use with Residual.
+This is a modified version of TinyGL 0.4 intended for use with ResidualVM.
 The changes made from the original version of TinyGL 0.4 are:
 
 * Changed file extensions from *.c to *.cpp to compile as C++.
-* Included only files needed by Residual.
+* Included only files needed by ResidualVM.
 * Changed include paths in source files.
 * Added needed type casts and fixes for proper compile.
 * Added 't/T' prefix to prevent OpenGL name clashes.
diff --git a/math/angle.cpp b/math/angle.cpp
index 45d537ec968..94599426b6e 100644
--- a/math/angle.cpp
+++ b/math/angle.cpp
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #include "common/streamdebug.h"
diff --git a/math/angle.h b/math/angle.h
index 8f42f349a46..d26a8cccb20 100644
--- a/math/angle.h
+++ b/math/angle.h
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #ifndef MATH_ANGLE_H
diff --git a/math/line2d.cpp b/math/line2d.cpp
index 133ef21e004..8115e15a11f 100644
--- a/math/line2d.cpp
+++ b/math/line2d.cpp
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #include "math/line2d.h"
diff --git a/math/line2d.h b/math/line2d.h
index 5000cb313f8..020565222ac 100644
--- a/math/line2d.h
+++ b/math/line2d.h
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #ifndef MATH_LINE2D_H
diff --git a/math/line3d.cpp b/math/line3d.cpp
index 4f5901182d9..d1bc9b39a4d 100644
--- a/math/line3d.cpp
+++ b/math/line3d.cpp
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #include "math/line3d.h"
diff --git a/math/line3d.h b/math/line3d.h
index 766762c6c9c..633cc6d69a5 100644
--- a/math/line3d.h
+++ b/math/line3d.h
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #ifndef MATH_LINE3D_H
diff --git a/math/mathfwd.h b/math/mathfwd.h
index e645b1c6e01..a10f40810b2 100644
--- a/math/mathfwd.h
+++ b/math/mathfwd.h
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #ifndef MATH_FWD_H
diff --git a/math/matrix.h b/math/matrix.h
index df68226c2f1..754940b9331 100644
--- a/math/matrix.h
+++ b/math/matrix.h
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #ifndef MATH_MATRIX_H
diff --git a/math/matrix3.cpp b/math/matrix3.cpp
index 357a9efb638..47d25081250 100644
--- a/math/matrix3.cpp
+++ b/math/matrix3.cpp
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #include "math/matrix3.h"
diff --git a/math/matrix3.h b/math/matrix3.h
index 97f566181fa..15aa7d91002 100644
--- a/math/matrix3.h
+++ b/math/matrix3.h
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #ifndef MATH_MATRIX3_H
diff --git a/math/matrix4.cpp b/math/matrix4.cpp
index ce091b7120a..ba2e21d887a 100644
--- a/math/matrix4.cpp
+++ b/math/matrix4.cpp
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #include "math/matrix4.h"
diff --git a/math/matrix4.h b/math/matrix4.h
index f501119d035..3dad7a5664b 100644
--- a/math/matrix4.h
+++ b/math/matrix4.h
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #ifndef MATH_MATRIX4_H
diff --git a/math/quat.cpp b/math/quat.cpp
index 595ac07cb6a..cc6d2695f1c 100644
--- a/math/quat.cpp
+++ b/math/quat.cpp
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 // Quaternion-math borrowed from plib http://plib.sourceforge.net/index.html
diff --git a/math/quat.h b/math/quat.h
index 174d3760958..c544d3e1ba3 100644
--- a/math/quat.h
+++ b/math/quat.h
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 // Quaternion-math borrowed from plib http://plib.sourceforge.net/index.html
diff --git a/math/rect2d.cpp b/math/rect2d.cpp
index 77985afad9b..2b22a8a1469 100644
--- a/math/rect2d.cpp
+++ b/math/rect2d.cpp
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #include "common/scummsys.h"
diff --git a/math/rect2d.h b/math/rect2d.h
index a9facdeeade..b6f95a70954 100644
--- a/math/rect2d.h
+++ b/math/rect2d.h
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #ifndef MATH_RECT2D_H
diff --git a/math/rotation3d.h b/math/rotation3d.h
index 28c053180a7..8cdee800e8a 100644
--- a/math/rotation3d.h
+++ b/math/rotation3d.h
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #ifndef MATH_ROTATION3D_H
diff --git a/math/squarematrix.h b/math/squarematrix.h
index a3cd8b4cc40..2933fea2a5e 100644
--- a/math/squarematrix.h
+++ b/math/squarematrix.h
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #ifndef MATH_SQUAREMATRIX_H
diff --git a/math/transform.h b/math/transform.h
index 5bc58203b7d..89d93207993 100644
--- a/math/transform.h
+++ b/math/transform.h
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #ifndef MATH_TRANSFORM_H
diff --git a/math/utils.h b/math/utils.h
index ad01b21c853..ff916fbb426 100644
--- a/math/utils.h
+++ b/math/utils.h
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #ifndef MATH_UTILS_H
diff --git a/math/vector.h b/math/vector.h
index 80d7f1c71b4..117645bc249 100644
--- a/math/vector.h
+++ b/math/vector.h
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #ifndef MATH_VECTOR_H
diff --git a/math/vector2d.cpp b/math/vector2d.cpp
index 5780faf0f3a..3743fe5e782 100644
--- a/math/vector2d.cpp
+++ b/math/vector2d.cpp
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #include "math/vector2d.h"
diff --git a/math/vector2d.h b/math/vector2d.h
index 052e3771d2f..d48ff8153b6 100644
--- a/math/vector2d.h
+++ b/math/vector2d.h
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #ifndef MATH_VECTOR2D_H
diff --git a/math/vector3d.cpp b/math/vector3d.cpp
index a1881959742..483a63b7e81 100644
--- a/math/vector3d.cpp
+++ b/math/vector3d.cpp
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #include "common/streamdebug.h"
diff --git a/math/vector3d.h b/math/vector3d.h
index 189de041674..e831c3ad2c5 100644
--- a/math/vector3d.h
+++ b/math/vector3d.h
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #ifndef MATH_VECTOR3D_H
diff --git a/math/vector4d.cpp b/math/vector4d.cpp
index f7a76867a6a..bdaecd07489 100644
--- a/math/vector4d.cpp
+++ b/math/vector4d.cpp
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #include "common/streamdebug.h"
diff --git a/math/vector4d.h b/math/vector4d.h
index b6c66708102..c58c82e9d1b 100644
--- a/math/vector4d.h
+++ b/math/vector4d.h
@@ -1,6 +1,6 @@
-/* Residual - A 3D game interpreter
+/* ResidualVM - A 3D game interpreter
  *
- * Residual is the legal property of its developers, whose names
+ * ResidualVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
- * $URL$
- * $Id$
  */
 
 #ifndef MATH_VECTOR4D_H