diff --git a/include/obj/AParticleModifier.h b/include/obj/NiParticleModifier.h
similarity index 89%
rename from include/obj/AParticleModifier.h
rename to include/obj/NiParticleModifier.h
index 7493a5b9ebd0a5e3a9b18c31c08f3461c8441ebd..f999aa6868637a94130274bd9d3ba14ccadf4eed 100644
--- a/include/obj/AParticleModifier.h
+++ b/include/obj/NiParticleModifier.h
@@ -7,10 +7,11 @@ All rights reserved.  Please see niflib.h for license. */
 // the next update.                                                          //
 //-----------------------------------NOTICE----------------------------------//
 
-#ifndef _APARTICLEMODIFIER_H_
-#define _APARTICLEMODIFIER_H_
+#ifndef _NIPARTICLEMODIFIER_H_
+#define _NIPARTICLEMODIFIER_H_
 
 //--BEGIN FILE HEAD CUSTOM CODE--//
+
 //--END CUSTOM CODE--//
 
 #include "NiObject.h"
@@ -21,17 +22,17 @@ namespace Niflib {
 
 // Forward define of referenced NIF objects
 class NiParticleSystemController;
-class AParticleModifier;
-typedef Ref<AParticleModifier> AParticleModifierRef;
+class NiParticleModifier;
+typedef Ref<NiParticleModifier> NiParticleModifierRef;
 
 /*! A particle system modifier. */
-class AParticleModifier : public NiObject {
+class NiParticleModifier : public NiObject {
 public:
 	/*! Constructor */
-	NIFLIB_API AParticleModifier();
+	NIFLIB_API NiParticleModifier();
 
 	/*! Destructor */
-	NIFLIB_API virtual ~AParticleModifier();
+	NIFLIB_API virtual ~NiParticleModifier();
 
 	/*!
 	 * A constant value which uniquly identifies objects of this type.
@@ -58,10 +59,11 @@ public:
 	NIFLIB_API virtual const Type & GetType() const;
 
 	//--BEGIN MISC CUSTOM CODE--//
+
 	//--END CUSTOM CODE--//
 protected:
 	/*! Next particle modifier. */
-	Ref<AParticleModifier > nextModifier;
+	Ref<NiParticleModifier > nextModifier;
 	/*! Points to the particle system controller parent. */
 	NiParticleSystemController * controller;
 public:
@@ -76,6 +78,7 @@ public:
 };
 
 //--BEGIN FILE FOOT CUSTOM CODE--//
+
 //--END CUSTOM CODE--//
 
 } //End Niflib namespace
diff --git a/niflib.vcproj b/niflib.vcproj
index f4da06328fab8262ce04dff907ee836f816b44d3..f45255f7b3c9afad616ed3662522360f57054ac8 100644
--- a/niflib.vcproj
+++ b/niflib.vcproj
@@ -360,10 +360,6 @@
 			<Filter
 				Name="obj"
 				>
-				<File
-					RelativePath=".\src\obj\AParticleModifier.cpp"
-					>
-				</File>
 				<File
 					RelativePath=".\src\obj\AvoidNode.cpp"
 					>
@@ -948,6 +944,10 @@
 					RelativePath=".\src\obj\NiParticleMeshModifier.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\obj\NiParticleModifier.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\obj\NiParticleRotation.cpp"
 					>
@@ -1602,10 +1602,6 @@
 			<Filter
 				Name="obj"
 				>
-				<File
-					RelativePath=".\include\obj\AParticleModifier.h"
-					>
-				</File>
 				<File
 					RelativePath=".\include\obj\AvoidNode.h"
 					>
@@ -2190,6 +2186,10 @@
 					RelativePath=".\include\obj\NiParticleMeshModifier.h"
 					>
 				</File>
+				<File
+					RelativePath=".\include\obj\NiParticleModifier.h"
+					>
+				</File>
 				<File
 					RelativePath=".\include\obj\NiParticleRotation.h"
 					>
diff --git a/src/obj/AParticleModifier.cpp b/src/obj/NiParticleModifier.cpp
similarity index 75%
rename from src/obj/AParticleModifier.cpp
rename to src/obj/NiParticleModifier.cpp
index 5a14c2214b1a659d7a8875ce9b7c5ed5edc05642..7d81b33f8dab364fa6334cabe4ccd405ee1ad38d 100644
--- a/src/obj/AParticleModifier.cpp
+++ b/src/obj/NiParticleModifier.cpp
@@ -8,38 +8,42 @@ All rights reserved.  Please see niflib.h for license. */
 //-----------------------------------NOTICE----------------------------------//
 
 //--BEGIN FILE HEAD CUSTOM CODE--//
+
 //--END CUSTOM CODE--//
 
 #include "../../include/FixLink.h"
 #include "../../include/ObjectRegistry.h"
 #include "../../include/NIF_IO.h"
-#include "../../include/obj/AParticleModifier.h"
+#include "../../include/obj/NiParticleModifier.h"
 #include "../../include/obj/NiParticleSystemController.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
-const Type AParticleModifier::TYPE("AParticleModifier", &NiObject::TYPE );
+const Type NiParticleModifier::TYPE("NiParticleModifier", &NiObject::TYPE );
 
-AParticleModifier::AParticleModifier() : nextModifier(NULL), controller(NULL) {
+NiParticleModifier::NiParticleModifier() : nextModifier(NULL), controller(NULL) {
 	//--BEGIN CONSTRUCTOR CUSTOM CODE--//
+
 	//--END CUSTOM CODE--//
 }
 
-AParticleModifier::~AParticleModifier() {
+NiParticleModifier::~NiParticleModifier() {
 	//--BEGIN DESTRUCTOR CUSTOM CODE--//
+
 	//--END CUSTOM CODE--//
 }
 
-const Type & AParticleModifier::GetType() const {
+const Type & NiParticleModifier::GetType() const {
 	return TYPE;
 }
 
-NiObject * AParticleModifier::Create() {
-	return new AParticleModifier;
+NiObject * NiParticleModifier::Create() {
+	return new NiParticleModifier;
 }
 
-void AParticleModifier::Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ) {
+void NiParticleModifier::Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ) {
 	//--BEGIN PRE-READ CUSTOM CODE--//
+
 	//--END CUSTOM CODE--//
 
 	unsigned int block_num;
@@ -52,11 +56,13 @@ void AParticleModifier::Read( istream& in, list<unsigned int> & link_stack, cons
 	};
 
 	//--BEGIN POST-READ CUSTOM CODE--//
+
 	//--END CUSTOM CODE--//
 }
 
-void AParticleModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const {
+void NiParticleModifier::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const {
 	//--BEGIN PRE-WRITE CUSTOM CODE--//
+
 	//--END CUSTOM CODE--//
 
 	NiObject::Write( out, link_map, info );
@@ -82,11 +88,13 @@ void AParticleModifier::Write( ostream& out, const map<NiObjectRef,unsigned int>
 	};
 
 	//--BEGIN POST-WRITE CUSTOM CODE--//
+
 	//--END CUSTOM CODE--//
 }
 
-std::string AParticleModifier::asString( bool verbose ) const {
+std::string NiParticleModifier::asString( bool verbose ) const {
 	//--BEGIN PRE-STRING CUSTOM CODE--//
+
 	//--END CUSTOM CODE--//
 
 	stringstream out;
@@ -97,24 +105,27 @@ std::string AParticleModifier::asString( bool verbose ) const {
 	return out.str();
 
 	//--BEGIN POST-STRING CUSTOM CODE--//
+
 	//--END CUSTOM CODE--//
 }
 
-void AParticleModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ) {
+void NiParticleModifier::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ) {
 	//--BEGIN PRE-FIXLINKS CUSTOM CODE--//
+
 	//--END CUSTOM CODE--//
 
 	NiObject::FixLinks( objects, link_stack, info );
-	nextModifier = FixLink<AParticleModifier>( objects, link_stack, info );
+	nextModifier = FixLink<NiParticleModifier>( objects, link_stack, info );
 	if ( info.version >= 0x04000002 ) {
 		controller = FixLink<NiParticleSystemController>( objects, link_stack, info );
 	};
 
 	//--BEGIN POST-FIXLINKS CUSTOM CODE--//
+
 	//--END CUSTOM CODE--//
 }
 
-std::list<NiObjectRef> AParticleModifier::GetRefs() const {
+std::list<NiObjectRef> NiParticleModifier::GetRefs() const {
 	list<Ref<NiObject> > refs;
 	refs = NiObject::GetRefs();
 	if ( nextModifier != NULL )
@@ -123,4 +134,5 @@ std::list<NiObjectRef> AParticleModifier::GetRefs() const {
 }
 
 //--BEGIN MISC CUSTOM CODE--//
+
 //--END CUSTOM CODE--//