diff --git a/niflib.vcproj b/niflib.vcproj
index 5212f353bcafba450c61d7ad69dacc0688962057..0baf57e3e0ba1309ee400a1d0e2c967c85d21222 100644
--- a/niflib.vcproj
+++ b/niflib.vcproj
@@ -194,9 +194,6 @@
 				<File
 					RelativePath=".\obj\APSysVolumeEmitter.cpp">
 				</File>
-				<File
-					RelativePath=".\obj\ASingleInterpolatorController.cpp">
-				</File>
 				<File
 					RelativePath=".\obj\AvoidNode.cpp">
 				</File>
@@ -686,6 +683,9 @@
 				<File
 					RelativePath=".\obj\NiShadeProperty.cpp">
 				</File>
+				<File
+					RelativePath=".\obj\NiSingleInterpolatorController.cpp">
+				</File>
 				<File
 					RelativePath=".\obj\NiSkinData.cpp">
 				</File>
@@ -857,9 +857,6 @@
 				<File
 					RelativePath=".\obj\APSysVolumeEmitter.h">
 				</File>
-				<File
-					RelativePath=".\obj\ASingleInterpolatorController.h">
-				</File>
 				<File
 					RelativePath=".\obj\AvoidNode.h">
 				</File>
@@ -1349,6 +1346,9 @@
 				<File
 					RelativePath=".\obj\NiShadeProperty.h">
 				</File>
+				<File
+					RelativePath=".\obj\NiSingleInterpolatorController.h">
+				</File>
 				<File
 					RelativePath=".\obj\NiSkinData.h">
 				</File>
diff --git a/obj/ASingleInterpolatorController.cpp b/obj/ASingleInterpolatorController.cpp
deleted file mode 100644
index 9661d2dee7f17f3aaed7e529fd36207a94381b72..0000000000000000000000000000000000000000
--- a/obj/ASingleInterpolatorController.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (c) 2006, NIF File Format Library and Tools
-All rights reserved.  Please see niflib.h for licence. */
-
-#include "ASingleInterpolatorController.h"
-#include "AInterpolator.h"
-
-//Definition of TYPE constant
-const Type ASingleInterpolatorController::TYPE("ASingleInterpolatorController", &A_SINGLE_INTERPOLATOR_CONTROLLER_PARENT::TYPE );
-
-ASingleInterpolatorController::ASingleInterpolatorController() A_SINGLE_INTERPOLATOR_CONTROLLER_CONSTRUCT {}
-
-ASingleInterpolatorController::~ASingleInterpolatorController() {}
-
-void ASingleInterpolatorController::Read( istream& in, list<uint> link_stack, unsigned int version ) {
-	A_SINGLE_INTERPOLATOR_CONTROLLER_READ
-}
-
-void ASingleInterpolatorController::Write( ostream& out, map<NiObjectRef,uint> link_map, unsigned int version ) const {
-	A_SINGLE_INTERPOLATOR_CONTROLLER_WRITE
-}
-
-string ASingleInterpolatorController::asString( bool verbose ) const {
-	A_SINGLE_INTERPOLATOR_CONTROLLER_STRING
-}
-
-void ASingleInterpolatorController::FixLinks( const vector<NiObjectRef> & objects, list<uint> link_stack, unsigned int version ) {
-	A_SINGLE_INTERPOLATOR_CONTROLLER_FIXLINKS
-}
-
diff --git a/obj/NiSingleInterpolatorController.cpp b/obj/NiSingleInterpolatorController.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..656b81b8189a04c5ebba44036c8f64354863c9ee
--- /dev/null
+++ b/obj/NiSingleInterpolatorController.cpp
@@ -0,0 +1,29 @@
+/* Copyright (c) 2006, NIF File Format Library and Tools
+All rights reserved.  Please see niflib.h for licence. */
+
+#include "NiSingleInterpolatorController.h"
+#include "AInterpolator.h"
+
+//Definition of TYPE constant
+const Type NiSingleInterpolatorController::TYPE("NiSingleInterpolatorController", &A_SINGLE_INTERPOLATOR_CONTROLLER_PARENT::TYPE );
+
+NiSingleInterpolatorController::NiSingleInterpolatorController() A_SINGLE_INTERPOLATOR_CONTROLLER_CONSTRUCT {}
+
+NiSingleInterpolatorController::~NiSingleInterpolatorController() {}
+
+void NiSingleInterpolatorController::Read( istream& in, list<uint> link_stack, unsigned int version ) {
+	A_SINGLE_INTERPOLATOR_CONTROLLER_READ
+}
+
+void NiSingleInterpolatorController::Write( ostream& out, map<NiObjectRef,uint> link_map, unsigned int version ) const {
+	A_SINGLE_INTERPOLATOR_CONTROLLER_WRITE
+}
+
+string NiSingleInterpolatorController::asString( bool verbose ) const {
+	A_SINGLE_INTERPOLATOR_CONTROLLER_STRING
+}
+
+void NiSingleInterpolatorController::FixLinks( const vector<NiObjectRef> & objects, list<uint> link_stack, unsigned int version ) {
+	A_SINGLE_INTERPOLATOR_CONTROLLER_FIXLINKS
+}
+
diff --git a/obj/ASingleInterpolatorController.h b/obj/NiSingleInterpolatorController.h
similarity index 70%
rename from obj/ASingleInterpolatorController.h
rename to obj/NiSingleInterpolatorController.h
index ea3617ec765c24e52a7b7091db9e978630114e4f..b0920315ba46c24a9adf6237634a651227a0e8d2 100644
--- a/obj/ASingleInterpolatorController.h
+++ b/obj/NiSingleInterpolatorController.h
@@ -8,16 +8,16 @@ All rights reserved.  Please see niflib.h for licence. */
 #include A_SINGLE_INTERPOLATOR_CONTROLLER_INCLUDE
 
 /*
- * ASingleInterpolatorController
+ * NiSingleInterpolatorController
  */
 
-class ASingleInterpolatorController;
-typedef Ref<ASingleInterpolatorController> ASingleInterpolatorControllerRef;
+class NiSingleInterpolatorController;
+typedef Ref<NiSingleInterpolatorController> NiSingleInterpolatorControllerRef;
 
-class ASingleInterpolatorController : public A_SINGLE_INTERPOLATOR_CONTROLLER_PARENT {
+class NiSingleInterpolatorController : public A_SINGLE_INTERPOLATOR_CONTROLLER_PARENT {
 public:
-	ASingleInterpolatorController();
-	~ASingleInterpolatorController();
+	NiSingleInterpolatorController();
+	~NiSingleInterpolatorController();
 	//Run-Time Type Information
 	static const Type TYPE;
 	virtual void Read( istream& in, list<uint> link_stack, unsigned int version );