diff --git a/Asset.C b/Asset.C
index 30129d91..c33d8873 100644
--- a/Asset.C
+++ b/Asset.C
@@ -11,10 +11,10 @@
 #include <maya/MGlobal.h>
 
 #include "Asset.h"
-#include "AssetInput.h"
+#include "Input.h"
 #include "AssetNode.h"
-#include "GeometryObject.h"
-#include "InstancerObject.h"
+#include "OutputGeometryObject.h"
+#include "OutputInstancerObject.h"
 #include "util.h"
 
 class AttrOperation : public Util::WalkParmOperation
@@ -383,7 +383,7 @@ Asset::Asset(
     hstat = HAPI_GetNodeInfo( myAssetInfo.nodeId, & myNodeInfo);
     Util::checkHAPIStatus(hstat);
 
-    myAssetInputs = new AssetInputs( myAssetInfo.id);
+    myAssetInputs = new Inputs( myAssetInfo.id);
     myAssetInputs->setNumInputs( myAssetInfo.maxGeoInputCount);
 
     // get the infos
@@ -391,7 +391,7 @@ Asset::Asset(
 
     // objects
     int objCount = myAssetInfo.objectCount;
-    myObjects = new Object*[objCount];
+    myObjects = new OutputObject*[objCount];
     myNumVisibleObjects = 0;
     myNumObjects = objCount;
 
@@ -402,7 +402,7 @@ Asset::Asset(
     for (int i=0; i<objCount; i++)
     {
 	Util::updateProgressWindow( status, (int)( (float) i *100.0f / (float) objCount) );
-        myObjects[i] = Object::createObject( myAssetInfo.id, i, this);
+        myObjects[i] = OutputObject::createObject( myAssetInfo.id, i, this);
     }
 
     Util::hideProgressWindow();
@@ -435,7 +435,7 @@ Asset::getAssetName() const
     return Util::getString(myAssetInfo.fullOpNameSH);
 }
 
-Object*
+OutputObject*
 Asset::findObjectByName(MString name)
 {
     for (int i=0; i< myAssetInfo.objectCount; i++)
@@ -448,7 +448,7 @@ Asset::findObjectByName(MString name)
 }
 
 
-Object*
+OutputObject*
 Asset::findObjectById(int id)
 {
     return myObjects[id];
@@ -519,10 +519,10 @@ Asset::computeInstancerObjects(
     MIntArray instancedObjIds;
     for (int i=0; i< myNumObjects; i++)
     {
-        Object* obj = myObjects[i];
+        OutputObject* obj = myObjects[i];
         //MPlug instancerElemPlug = instancersPlug.elementByLogicalIndex( instancerIndex );
 
-        if ( obj->type() == Object::OBJECT_TYPE_INSTANCER )
+        if ( obj->type() == OutputObject::OBJECT_TYPE_INSTANCER )
         {
             MDataHandle instancerElemHandle = instancersBuilder.addElement( instancerIndex );
             stat = obj->compute(instancerElemHandle, needToSyncOutputs);
@@ -531,11 +531,11 @@ Asset::computeInstancerObjects(
                 instancerIndex++;
 
                 // get all the object ids that are instanced
-                MIntArray instIds = dynamic_cast< InstancerObject* >( obj )->getInstancedObjIds();
-                MStringArray instNames = dynamic_cast< InstancerObject* >( obj )->getUniqueInstObjNames();
+                MIntArray instIds = dynamic_cast< OutputInstancerObject* >( obj )->getInstancedObjIds();
+                MStringArray instNames = dynamic_cast< OutputInstancerObject* >( obj )->getUniqueInstObjNames();
                 for ( unsigned int j = 0; j < instNames.length(); ++j )
                 {
-                    Object* o = findObjectByName( instNames[ j ] );
+                    OutputObject* o = findObjectByName( instNames[ j ] );
                     if ( o != NULL )
                         instancedObjIds.append( o->getId() );
                 }
@@ -560,7 +560,7 @@ Asset::computeInstancerObjects(
     // mark instanced objects
     for ( unsigned int i = 0; i < instancedObjIds.length(); ++i )
     {
-        Object* obj = myObjects[ instancedObjIds[ i ] ];
+        OutputObject* obj = myObjects[ instancedObjIds[ i ] ];
         obj->myIsInstanced = true;
     }
 
@@ -589,11 +589,11 @@ Asset::computeGeometryObjects(
 
     for (int ii = 0; ii < myNumObjects; ii++)
     {
-        Object * obj = myObjects[ ii ];        
+        OutputObject * obj = myObjects[ ii ];        
 
 	MDataHandle objectHandle = objectsBuilder.addElement( ii );
 
-        if (obj->type() == Object::OBJECT_TYPE_GEOMETRY)
+        if (obj->type() == OutputObject::OBJECT_TYPE_GEOMETRY)
         {
             obj->compute(objectHandle, needToSyncOutputs);
 
@@ -659,7 +659,7 @@ Asset::compute(
     float time = (float)currentTime.as(MTime::kSeconds);
     HAPI_SetTime(time);
 
-    //this figures out the Houdini asset inputs (Geo, Transform)
+    //this figures out the Houdini asset inputs (OutputGeometry, Transform)
     //for inter-asset stuff
     computeAssetInputs(plug, data);
 
@@ -684,7 +684,7 @@ Asset::compute(
     return stat;
 }
 
-Object**
+OutputObject**
 Asset::getObjects()
 {
     return myObjects;
diff --git a/Asset.h b/Asset.h
index da19f3e7..9af28c23 100644
--- a/Asset.h
+++ b/Asset.h
@@ -7,11 +7,11 @@
 
 #include <HAPI/HAPI.h>
 
-#include "Object.h"
+#include "OutputObject.h"
 
 #include <vector>
 
-class AssetInputs;
+class Inputs;
 class MFnDependencyNode;
 
 class Asset {
@@ -26,9 +26,9 @@ class Asset {
         MString getOTLFilePath() const;
         MString getAssetName() const;
 
-        Object** getObjects();
-        Object* findObjectByName(MString name);
-        Object* findObjectById(int id);
+        OutputObject** getObjects();
+        OutputObject* findObjectByName(MString name);
+        OutputObject* findObjectById(int id);
         HAPI_AssetInfo getAssetInfo() { return myAssetInfo; }
 
         // Getters for infos
@@ -95,9 +95,9 @@ class Asset {
         HAPI_AssetInfo 	myAssetInfo;
         MObject myNode;		    //The Maya asset node
 
-	AssetInputs* myAssetInputs;
+	Inputs* myAssetInputs;
 	//TODO: make this a vector.  The double pointer assumes the number of objects is static
-        Object** myObjects;	    //the Object class contains a 1 to 1 map with HAPI_ObjectInfos.
+        OutputObject** myObjects;	    //the OutputObject class contains a 1 to 1 map with HAPI_ObjectInfos.
 
         // Arrays of infos that can be accessed when updating objects,
         // keeping them here avoids getting them for individual object.
diff --git a/AssetNode.C b/AssetNode.C
index e33cd24e..f5ef5010 100644
--- a/AssetNode.C
+++ b/AssetNode.C
@@ -11,7 +11,7 @@
 #include <algorithm>
 
 #include "Asset.h"
-#include "AssetInput.h"
+#include "Input.h"
 #include "AssetNode.h"
 #include "MayaTypeID.h"
 #include "util.h"
@@ -178,7 +178,7 @@ AssetNode::initialize()
     AssetNode::outputTemplateObjects = nAttr.create("outputTemplateObjects", "outputTemplateObjects", MFnNumericData::kBoolean);
 
     // input
-    AssetNode::input = AssetInputs::createInputAttribute();
+    AssetNode::input = Inputs::createInputAttribute();
 
     //----------------------------------  instancer compound multi----------------------------------------------
     // instancer data
diff --git a/AssetNode.h b/AssetNode.h
index 380384ca..53edcd88 100644
--- a/AssetNode.h
+++ b/AssetNode.h
@@ -27,9 +27,9 @@ class Asset;
 //  It does this by first calling computeInstancerObjects() then 
 //  computeGeometryObjects().  Each of these will fill out the information in
 //  the output attribute.  For computeInstancerObjects() it will end up doing the
-//  work by calling the compute() function of the InstancerObject class, and
+//  work by calling the compute() function of the OutputInstancerObject class, and
 //  for computeGeometryObjects() it will call the computeParts() function of the
-//  GeometryObject class.  
+//  OutputGeometryObject class.  
 
 
 class AssetNode: public MPxTransform
diff --git a/AssetSubCommandSync.C b/AssetSubCommandSync.C
index 74e1ff72..66cdc288 100644
--- a/AssetSubCommandSync.C
+++ b/AssetSubCommandSync.C
@@ -8,9 +8,9 @@
 #include <maya/MFnDagNode.h>
 
 #include "AssetNode.h"
-#include "AssetSyncAttribute.h"
-#include "AssetSyncOutputObject.h"
-#include "AssetSyncOutputInstance.h"
+#include "SyncAttribute.h"
+#include "SyncOutputObject.h"
+#include "SyncOutputInstance.h"
 
 AssetSubCommandSync::AssetSubCommandSync(
         const MObject &assetNodeObj
@@ -73,7 +73,7 @@ AssetSubCommandSync::doIt()
     // attributes
     if(mySyncAll || mySyncAttributes)
     {
-	AssetSubCommand* syncOutput = new AssetSyncAttribute(myAssetNodeObj);
+	AssetSubCommand* syncOutput = new SyncAttribute(myAssetNodeObj);
 	syncOutput->doIt();
 
 	myAssetSyncs.push_back(syncOutput);
@@ -120,7 +120,7 @@ AssetSubCommandSync::doIt()
 
             if( mySyncOutputHidden || visible || instanced )
             {
-                AssetSubCommand* syncOutput = new AssetSyncOutputObject(elemPlug, 
+                AssetSubCommand* syncOutput = new SyncOutputObject(elemPlug, 
                         myAssetNodeObj, visible, mySyncOutputTemplatedGeos );
                 syncOutput->doIt();
 
@@ -137,7 +137,7 @@ AssetSubCommandSync::doIt()
         {
             MPlug elemPlug = instancersPlug[i];
 
-            AssetSubCommand* syncOutput = new AssetSyncOutputInstance(elemPlug, i, myAssetNodeObj);
+            AssetSubCommand* syncOutput = new SyncOutputInstance(elemPlug, i, myAssetNodeObj);
             syncOutput->doIt();
 
             myAssetSyncs.push_back(syncOutput);
diff --git a/AssetInput.C b/Input.C
similarity index 60%
rename from AssetInput.C
rename to Input.C
index 59e283b0..05bf7c8c 100644
--- a/AssetInput.C
+++ b/Input.C
@@ -1,4 +1,4 @@
-#include "AssetInput.h"
+#include "Input.h"
 
 #include <maya/MFnCompoundAttribute.h>
 #include <maya/MFnGenericAttribute.h>
@@ -12,46 +12,46 @@
 
 #include <HAPI/HAPI.h>
 
-#include "AssetInputAsset.h"
-#include "AssetInputMesh.h"
-#include "AssetInputCurve.h"
-#include "AssetInputParticle.h"
+#include "InputAsset.h"
+#include "InputMesh.h"
+#include "InputCurve.h"
+#include "InputParticle.h"
 
-MObject AssetInputs::input;
-MObject AssetInputs::inputTransform;
-MObject AssetInputs::inputGeo;
+MObject Inputs::input;
+MObject Inputs::inputTransform;
+MObject Inputs::inputGeo;
 
 MObject
-AssetInputs::createInputAttribute()
+Inputs::createInputAttribute()
 {
     MFnCompoundAttribute cAttr;
     MFnMatrixAttribute mAttr;
     MFnGenericAttribute gAttr;
 
-    AssetInputs::inputTransform = mAttr.create("inputTransform", "inputTransform");
+    Inputs::inputTransform = mAttr.create("inputTransform", "inputTransform");
 
-    AssetInputs::inputGeo = gAttr.create("inputGeo", "inputGeo");
+    Inputs::inputGeo = gAttr.create("inputGeo", "inputGeo");
     gAttr.addDataAccept(MFnData::kIntArray);
     gAttr.addDataAccept(MFnData::kMesh);
     gAttr.addDataAccept(MFnData::kNurbsCurve);
     gAttr.addDataAccept(MFnData::kVectorArray);
 
-    AssetInputs::input = cAttr.create("input", "input");
-    cAttr.addChild(AssetInputs::inputTransform);
-    cAttr.addChild(AssetInputs::inputGeo);
+    Inputs::input = cAttr.create("input", "input");
+    cAttr.addChild(Inputs::inputTransform);
+    cAttr.addChild(Inputs::inputGeo);
     cAttr.setDisconnectBehavior(MFnAttribute::kReset);
     cAttr.setInternal(true);
     cAttr.setArray(true);
 
-    return AssetInputs::input;
+    return Inputs::input;
 }
 
-AssetInputs::AssetInputs(int assetId) :
+Inputs::Inputs(int assetId) :
     myAssetId(assetId)
 {
 }
 
-AssetInputs::~AssetInputs()
+Inputs::~Inputs()
 {
     for(AssetInputVector::iterator iter = myAssetInputs.begin();
 	    iter != myAssetInputs.end();
@@ -63,12 +63,12 @@ AssetInputs::~AssetInputs()
     myAssetInputs.clear();
 }
 
-void AssetInputs::setNumInputs(int numInputs)
+void Inputs::setNumInputs(int numInputs)
 {
-    // delete any AssetInput that will be removed
+    // delete any Input that will be removed
     for(unsigned int i = numInputs; i < myAssetInputs.size(); i++)
     {
-	AssetInput* &assetInput = myAssetInputs[i];
+	Input* &assetInput = myAssetInputs[i];
 
 	if(assetInput)
 	{
@@ -81,7 +81,7 @@ void AssetInputs::setNumInputs(int numInputs)
 }
 
 void
-AssetInputs::setInput(
+Inputs::setInput(
         int inputIdx,
         MDataBlock &dataBlock,
         const MPlug &plug
@@ -91,7 +91,7 @@ AssetInputs::setInput(
 
     bool isValidInput = true;
 
-    MPlug inputGeoPlug = plug.child(AssetInputs::inputGeo);
+    MPlug inputGeoPlug = plug.child(Inputs::inputGeo);
 
     // Check if the plug is actually connected. The MDataHandle could contain
     // valid geometry from previous connection.
@@ -113,7 +113,7 @@ AssetInputs::setInput(
         isValidInput = status;
     }
 
-    AssetInput* &assetInput = myAssetInputs[inputIdx];
+    Input* &assetInput = myAssetInputs[inputIdx];
 
     if(!isValidInput)
     {
@@ -124,22 +124,22 @@ AssetInputs::setInput(
     }
 
     // determine the new input type
-    AssetInput::AssetInputType newAssetInputType = AssetInput::AssetInputType_Invalid;
+    Input::AssetInputType newAssetInputType = Input::AssetInputType_Invalid;
     if(geoDataHandle.type() == MFnData::kIntArray)
     {
-	newAssetInputType = AssetInput::AssetInputType_Asset;
+	newAssetInputType = Input::AssetInputType_Asset;
     }
     else if(geoDataHandle.type() == MFnData::kMesh)
     {
-	newAssetInputType = AssetInput::AssetInputType_Mesh;
+	newAssetInputType = Input::AssetInputType_Mesh;
     }
     else if(geoDataHandle.type() == MFnData::kNurbsCurve)
     {
-	newAssetInputType = AssetInput::AssetInputType_Curve;
+	newAssetInputType = Input::AssetInputType_Curve;
     }
     else if(geoDataHandle.type() == MFnData::kVectorArray)
     {
-	newAssetInputType = AssetInput::AssetInputType_Particle;
+	newAssetInputType = Input::AssetInputType_Particle;
     }
 
     // if the existing input doesn't match the new input type, delete it
@@ -149,10 +149,10 @@ AssetInputs::setInput(
 	assetInput = NULL;
     }
 
-    // create AssetInput if necessary
+    // create Input if necessary
     if(!assetInput)
     {
-	assetInput = AssetInput::createAssetInput(myAssetId, inputIdx, newAssetInputType);
+	assetInput = Input::createAssetInput(myAssetId, inputIdx, newAssetInputType);
     }
 
     if(!assetInput)
@@ -161,42 +161,42 @@ AssetInputs::setInput(
     }
 
     // set input transform
-    MPlug transformPlug = plug.child(AssetInputs::inputTransform);
+    MPlug transformPlug = plug.child(Inputs::inputTransform);
     MDataHandle transformHandle = dataBlock.inputValue(transformPlug);
     assetInput->setInputTransform(transformHandle);
 
     // set input geo
-    MPlug geoPlug = plug.child(AssetInputs::inputGeo);
+    MPlug geoPlug = plug.child(Inputs::inputGeo);
     assetInput->setInputGeo(dataBlock, geoPlug);
 }
 
-AssetInput::AssetInput(int assetId, int inputIdx) :
+Input::Input(int assetId, int inputIdx) :
     myAssetId(assetId),
     myInputIdx(inputIdx)
 {
 }
 
-AssetInput::~AssetInput()
+Input::~Input()
 {
 }
 
-AssetInput*
-AssetInput::createAssetInput(int assetId, int inputIdx, AssetInputType assetInputType)
+Input*
+Input::createAssetInput(int assetId, int inputIdx, AssetInputType assetInputType)
 {
-    AssetInput* assetInput = NULL;
+    Input* assetInput = NULL;
     switch(assetInputType)
     {
 	case AssetInputType_Asset:
-	    assetInput = new AssetInputAsset(assetId, inputIdx);
+	    assetInput = new InputAsset(assetId, inputIdx);
 	    break;
 	case AssetInputType_Mesh:
-	    assetInput = new AssetInputMesh(assetId, inputIdx);
+	    assetInput = new InputMesh(assetId, inputIdx);
 	    break;
 	case AssetInputType_Curve:
-	    assetInput = new AssetInputCurve(assetId, inputIdx);
+	    assetInput = new InputCurve(assetId, inputIdx);
 	    break;
 	case AssetInputType_Particle:
-	    assetInput = new AssetInputParticle(assetId, inputIdx);
+	    assetInput = new InputParticle(assetId, inputIdx);
 	    break;
 	case AssetInputType_Invalid:
 	    break;
diff --git a/AssetInput.h b/Input.h
similarity index 73%
rename from AssetInput.h
rename to Input.h
index 5d19dbef..c898cf10 100644
--- a/AssetInput.h
+++ b/Input.h
@@ -1,21 +1,21 @@
-#ifndef __AssetInput_h__
-#define __AssetInput_h__
+#ifndef __Input_h__
+#define __Input_h__
 
 #include <vector>
 
 #include <maya/MDataHandle.h>
 
-class AssetInput;
+class Input;
 class MDataBlock;
 
-class AssetInputs
+class Inputs
 {
     public:
 	static MObject createInputAttribute();
 
     public:
-	AssetInputs(int assetId);
-	~AssetInputs();
+	Inputs(int assetId);
+	~Inputs();
 
 	void setNumInputs(int numInputs);
         void setInput(
@@ -27,7 +27,7 @@ class AssetInputs
     private:
 	int myAssetId;
 
-	typedef std::vector<AssetInput*> AssetInputVector;
+	typedef std::vector<Input*> AssetInputVector;
 	AssetInputVector myAssetInputs;
 
     public:
@@ -36,7 +36,7 @@ class AssetInputs
 	static MObject inputGeo;
 };
 
-class AssetInput
+class Input
 {
     public:
 	enum AssetInputType
@@ -48,11 +48,11 @@ class AssetInput
 	    AssetInputType_Particle,
 	};
 
-	static AssetInput* createAssetInput(int assetId, int inputIdx, AssetInputType assetInputType);
+	static Input* createAssetInput(int assetId, int inputIdx, AssetInputType assetInputType);
 
     public:
-	AssetInput(int assetId, int inputIdx);
-	virtual ~AssetInput();
+	Input(int assetId, int inputIdx);
+	virtual ~Input();
 
 	virtual AssetInputType assetInputType() const = 0;
 
diff --git a/AssetInputAsset.C b/InputAsset.C
similarity index 54%
rename from AssetInputAsset.C
rename to InputAsset.C
index bf35e7c0..d59c96f2 100644
--- a/AssetInputAsset.C
+++ b/InputAsset.C
@@ -1,4 +1,4 @@
-#include "AssetInputAsset.h"
+#include "InputAsset.h"
 
 #include <maya/MFnIntArrayData.h>
 #include <maya/MDataBlock.h>
@@ -6,28 +6,28 @@
 
 #include <HAPI/HAPI.h>
 
-AssetInputAsset::AssetInputAsset(int assetId, int inputIdx) :
-    AssetInput(assetId, inputIdx)
+InputAsset::InputAsset(int assetId, int inputIdx) :
+    Input(assetId, inputIdx)
 {
 }
 
-AssetInputAsset::~AssetInputAsset()
+InputAsset::~InputAsset()
 {
 }
 
-AssetInputAsset::AssetInputType
-AssetInputAsset::assetInputType() const
+InputAsset::AssetInputType
+InputAsset::assetInputType() const
 {
-    return AssetInput::AssetInputType_Asset;
+    return Input::AssetInputType_Asset;
 }
 
 void
-AssetInputAsset::setInputTransform(MDataHandle &dataHandle)
+InputAsset::setInputTransform(MDataHandle &dataHandle)
 {
 }
 
 void
-AssetInputAsset::setInputGeo(
+InputAsset::setInputGeo(
         MDataBlock &dataBlock,
         const MPlug &plug
         )
diff --git a/AssetInputAsset.h b/InputAsset.h
similarity index 56%
rename from AssetInputAsset.h
rename to InputAsset.h
index 30355743..56b2653b 100644
--- a/AssetInputAsset.h
+++ b/InputAsset.h
@@ -1,13 +1,13 @@
-#ifndef __AssetInputAsset_h__
-#define __AssetInputAsset_h__
+#ifndef __InputAsset_h__
+#define __InputAsset_h__
 
-#include "AssetInput.h"
+#include "Input.h"
 
-class AssetInputAsset : public AssetInput
+class InputAsset : public Input
 {
     public:
-	AssetInputAsset(int assetId, int inputIdx);
-	virtual ~AssetInputAsset();
+	InputAsset(int assetId, int inputIdx);
+	virtual ~InputAsset();
 
 	virtual AssetInputType assetInputType() const;
 
diff --git a/AssetInputCurve.C b/InputCurve.C
similarity index 90%
rename from AssetInputCurve.C
rename to InputCurve.C
index c0d99477..c073acea 100644
--- a/AssetInputCurve.C
+++ b/InputCurve.C
@@ -1,4 +1,4 @@
-#include "AssetInputCurve.h"
+#include "InputCurve.h"
 
 #include <sstream>
 
@@ -11,8 +11,8 @@
 
 #include "util.h"
 
-AssetInputCurve::AssetInputCurve(int assetId, int inputIdx) :
-    AssetInput( assetId, inputIdx )
+InputCurve::InputCurve(int assetId, int inputIdx) :
+    Input( assetId, inputIdx )
 {
     int curveAssetId;
     HAPI_CreateCurve(&curveAssetId);
@@ -21,21 +21,21 @@ AssetInputCurve::AssetInputCurve(int assetId, int inputIdx) :
     HAPI_GetNodeInfo(myCurveAssetInfo.nodeId, &myCurveNodeInfo);
 }
 
-AssetInputCurve::~AssetInputCurve()
+InputCurve::~InputCurve()
 {
     HAPI_DisconnectAssetGeometry(myAssetId, myInputIdx);
 
     HAPI_DestroyAsset(myCurveAssetInfo.id);
 }
 
-AssetInputCurve::AssetInputType
-AssetInputCurve::assetInputType() const
+InputCurve::AssetInputType
+InputCurve::assetInputType() const
 {
-    return AssetInput::AssetInputType_Curve;
+    return Input::AssetInputType_Curve;
 }
 
 void
-AssetInputCurve::setInputTransform(MDataHandle &dataHandle)
+InputCurve::setInputTransform(MDataHandle &dataHandle)
 {
     MMatrix transformMatrix = dataHandle.asMatrix();
 
@@ -48,7 +48,7 @@ AssetInputCurve::setInputTransform(MDataHandle &dataHandle)
 }
 
 void
-AssetInputCurve::setInputGeo(
+InputCurve::setInputGeo(
         MDataBlock &dataBlock,
         const MPlug &plug
         )
diff --git a/AssetInputCurve.h b/InputCurve.h
similarity index 65%
rename from AssetInputCurve.h
rename to InputCurve.h
index e010f954..5c1a1f37 100644
--- a/AssetInputCurve.h
+++ b/InputCurve.h
@@ -1,15 +1,15 @@
-#ifndef __AssetInputCurve_h__
-#define __AssetInputCurve_h__
+#ifndef __InputCurve_h__
+#define __InputCurve_h__
 
-#include "AssetInput.h"
+#include "Input.h"
 
 #include <HAPI/HAPI_Common.h>
 
-class AssetInputCurve : public AssetInput
+class InputCurve : public Input
 {
     public:
-	AssetInputCurve(int assetId, int inputIdx);
-	virtual ~AssetInputCurve();
+	InputCurve(int assetId, int inputIdx);
+	virtual ~InputCurve();
 
 	virtual AssetInputType assetInputType() const;
 
diff --git a/AssetInputMesh.C b/InputMesh.C
similarity index 94%
rename from AssetInputMesh.C
rename to InputMesh.C
index fd846d3a..0682d563 100644
--- a/AssetInputMesh.C
+++ b/InputMesh.C
@@ -1,4 +1,4 @@
-#include "AssetInputMesh.h"
+#include "InputMesh.h"
 
 #include <maya/MFnMesh.h>
 #include <maya/MDataBlock.h>
@@ -10,25 +10,25 @@
 
 #include "util.h"
 
-AssetInputMesh::AssetInputMesh(int assetId, int inputIdx) :
-    AssetInput(assetId, inputIdx),
+InputMesh::InputMesh(int assetId, int inputIdx) :
+    Input(assetId, inputIdx),
     myInputAssetId(0)
 {
     HAPI_CreateGeoInput(myAssetId, myInputIdx, &myInputInfo);
 }
 
-AssetInputMesh::~AssetInputMesh()
+InputMesh::~InputMesh()
 {
 }
 
-AssetInput::AssetInputType
-AssetInputMesh::assetInputType() const
+Input::AssetInputType
+InputMesh::assetInputType() const
 {
-    return AssetInput::AssetInputType_Mesh;
+    return Input::AssetInputType_Mesh;
 }
 
 void
-AssetInputMesh::setInputTransform(MDataHandle &dataHandle)
+InputMesh::setInputTransform(MDataHandle &dataHandle)
 {
     MMatrix transformMatrix = dataHandle.asMatrix();
 
@@ -41,7 +41,7 @@ AssetInputMesh::setInputTransform(MDataHandle &dataHandle)
 }
 
 void
-AssetInputMesh::setInputGeo(
+InputMesh::setInputGeo(
         MDataBlock &dataBlock,
         const MPlug &plug
         )
diff --git a/AssetInputMesh.h b/InputMesh.h
similarity index 64%
rename from AssetInputMesh.h
rename to InputMesh.h
index 1ed0496c..0a14bf0a 100644
--- a/AssetInputMesh.h
+++ b/InputMesh.h
@@ -1,15 +1,15 @@
-#ifndef __AssetInputMesh_h__
-#define __AssetInputMesh_h__
+#ifndef __InputMesh_h__
+#define __InputMesh_h__
 
-#include "AssetInput.h"
+#include "Input.h"
 
 #include <HAPI/HAPI.h>
 
-class AssetInputMesh : public AssetInput
+class InputMesh : public Input
 {
     public:
-	AssetInputMesh(int assetId, int inputIdx);
-	virtual ~AssetInputMesh();
+	InputMesh(int assetId, int inputIdx);
+	virtual ~InputMesh();
 
 	virtual AssetInputType assetInputType() const;
 
diff --git a/AssetInputParticle.C b/InputParticle.C
similarity index 95%
rename from AssetInputParticle.C
rename to InputParticle.C
index 85756baa..8f06dd01 100644
--- a/AssetInputParticle.C
+++ b/InputParticle.C
@@ -1,4 +1,4 @@
-#include "AssetInputParticle.h"
+#include "InputParticle.h"
 
 #include <maya/MFnAttribute.h>
 #include <maya/MFnParticleSystem.h>
@@ -12,25 +12,25 @@
 
 #include "util.h"
 
-AssetInputParticle::AssetInputParticle(int assetId, int inputIdx) :
-    AssetInput(assetId, inputIdx),
+InputParticle::InputParticle(int assetId, int inputIdx) :
+    Input(assetId, inputIdx),
     myInputAssetId(0)
 {
     HAPI_CreateGeoInput(myAssetId, myInputIdx, &myInputInfo);
 }
 
-AssetInputParticle::~AssetInputParticle()
+InputParticle::~InputParticle()
 {
 }
 
-AssetInput::AssetInputType
-AssetInputParticle::assetInputType() const
+Input::AssetInputType
+InputParticle::assetInputType() const
 {
-    return AssetInput::AssetInputType_Particle;
+    return Input::AssetInputType_Particle;
 }
 
 void
-AssetInputParticle::setInputTransform(MDataHandle &dataHandle)
+InputParticle::setInputTransform(MDataHandle &dataHandle)
 {
     MMatrix transformMatrix = dataHandle.asMatrix();
 
@@ -43,7 +43,7 @@ AssetInputParticle::setInputTransform(MDataHandle &dataHandle)
 }
 
 void
-AssetInputParticle::setAttributePointData(
+InputParticle::setAttributePointData(
         const char* attributeName,
         HAPI_StorageType storage,
         int count,
@@ -90,7 +90,7 @@ AssetInputParticle::setAttributePointData(
 }
 
 void
-AssetInputParticle::setInputGeo(
+InputParticle::setInputGeo(
         MDataBlock &dataBlock,
         const MPlug &plug
         )
diff --git a/AssetInputParticle.h b/InputParticle.h
similarity index 73%
rename from AssetInputParticle.h
rename to InputParticle.h
index 585994ab..3506b220 100644
--- a/AssetInputParticle.h
+++ b/InputParticle.h
@@ -1,15 +1,15 @@
-#ifndef __AssetInputParticle_h__
-#define __AssetInputParticle_h__
+#ifndef __InputParticle_h__
+#define __InputParticle_h__
 
-#include "AssetInput.h"
+#include "Input.h"
 
 #include <HAPI/HAPI.h>
 
-class AssetInputParticle : public AssetInput
+class InputParticle : public Input
 {
     public:
-	AssetInputParticle(int assetId, int inputIdx);
-	virtual ~AssetInputParticle();
+	InputParticle(int assetId, int inputIdx);
+	virtual ~InputParticle();
 
 	virtual AssetInputType assetInputType() const;
 
diff --git a/Makefile b/Makefile
index 6af9c303..ff0e2a6a 100644
--- a/Makefile
+++ b/Makefile
@@ -212,21 +212,21 @@ CXXFILES = \
 	   AssetSubCommandLoadAsset.C \
 	   AssetSubCommandSync.C \
 	   Asset.C \
-	   AssetInput.C \
-	   AssetInputAsset.C \
-	   AssetInputMesh.C \
-	   AssetInputCurve.C \
-	   AssetInputParticle.C \
-	   Object.C \
+	   Input.C \
+	   InputAsset.C \
+	   InputMesh.C \
+	   InputCurve.C \
+	   InputParticle.C \
+	   OutputObject.C \
 	   util.C \
-	   GeometryObject.C \
-	   InstancerObject.C \
-	   Geo.C \
-	   GeometryPart.C \
-	   AssetSyncAttribute.C \
-	   AssetSyncOutputObject.C \
-	   AssetSyncOutputGeoPart.C \
-	   AssetSyncOutputInstance.C \
+	   OutputGeometryObject.C \
+	   OutputInstancerObject.C \
+	   OutputGeometry.C \
+	   OutputGeometryPart.C \
+	   SyncAttribute.C \
+	   SyncOutputObject.C \
+	   SyncOutputGeometryPart.C \
+	   SyncOutputInstance.C \
 	   FluidVelocityConvert.C \
 	   plugin.C
 
diff --git a/Geo.C b/OutputGeometry.C
similarity index 91%
rename from Geo.C
rename to OutputGeometry.C
index 39ef8fb7..4b9d084f 100644
--- a/Geo.C
+++ b/OutputGeometry.C
@@ -1,17 +1,17 @@
 
-#include "Geo.h"
-#include "GeometryPart.h"
-#include "Object.h"
+#include "OutputGeometry.h"
+#include "OutputGeometryPart.h"
+#include "OutputObject.h"
 #include "util.h"
 #include "AssetNode.h"
 
 
-Geo::~Geo() 
+OutputGeometry::~OutputGeometry() 
 {    
 }
 
 
-Geo::Geo( int assetId, int objectId, int geoId, Object * parentObject) :
+OutputGeometry::OutputGeometry( int assetId, int objectId, int geoId, OutputObject * parentObject) :
     myParentObject ( parentObject ),    
     myAssetId ( assetId ),
     myObjectId ( objectId ),
@@ -38,7 +38,7 @@ Geo::Geo( int assetId, int objectId, int geoId, Object * parentObject) :
 
             for ( int ii = 0; ii < partCount; ii++)
             {
-                myParts.push_back( GeometryPart( myAssetId, 
+                myParts.push_back( OutputGeometryPart( myAssetId, 
                                                  myObjectId, 
                                                  myGeoId, 
                                                  ii, 
@@ -56,7 +56,7 @@ Geo::Geo( int assetId, int objectId, int geoId, Object * parentObject) :
 }
 
 void
-Geo::update()
+OutputGeometry::update()
 {
     HAPI_Result hstat = HAPI_RESULT_SUCCESS;
     try
@@ -82,7 +82,7 @@ Geo::update()
                     HAPI_ObjectInfo objectInfo = myParentObject->getObjectInfo();
                     for ( int ii = 0; ii < partCount; ii++ )
                     {	                
-                        myParts.push_back( GeometryPart( myAssetId, 
+                        myParts.push_back( OutputGeometryPart( myAssetId, 
                                                          myObjectId, 
                                                          myGeoId, 
                                                          ii, 
@@ -106,7 +106,7 @@ Geo::update()
 
 
 MStatus 
-Geo::compute(MDataHandle &geoHandle, bool &needToSyncOutputs)
+OutputGeometry::compute(MDataHandle &geoHandle, bool &needToSyncOutputs)
 {
     MStatus stat;    
 
@@ -159,7 +159,7 @@ Geo::compute(MDataHandle &geoHandle, bool &needToSyncOutputs)
 }
 
 MStatus 
-Geo::setClean( MPlug& geoPlug, MDataBlock& data )
+OutputGeometry::setClean( MPlug& geoPlug, MDataBlock& data )
 {
     MPlug partsPlug = geoPlug.child( AssetNode::outputParts );
     for (int jj=0; jj < myGeoInfo.partCount; jj++)
diff --git a/Geo.h b/OutputGeometry.h
similarity index 56%
rename from Geo.h
rename to OutputGeometry.h
index 61bdd417..b6c98ba3 100644
--- a/Geo.h
+++ b/OutputGeometry.h
@@ -1,5 +1,5 @@
-#ifndef __Geo_h__
-#define __Geo_h__
+#ifndef __OutputGeometry_h__
+#define __OutputGeometry_h__
 
 #include <maya/MStatus.h>
 #include <maya/MDataBlock.h>
@@ -8,16 +8,16 @@
 
 #include <HAPI/HAPI.h>
 
-class Object;
-class GeometryPart;
+class OutputObject;
+class OutputGeometryPart;
 
-class Geo {
+class OutputGeometry {
 
     public:
         
         
-        Geo( int assetId, int objectId, int geoId, Object * parentObject );
-        ~Geo();
+        OutputGeometry( int assetId, int objectId, int geoId, OutputObject * parentObject );
+        ~OutputGeometry();
 
         MStatus setClean( MPlug& geoPlug, MDataBlock& data );
 
@@ -27,13 +27,13 @@ class Geo {
     
     protected:
         
-        Object* myParentObject;        
+        OutputObject* myParentObject;        
         HAPI_GeoInfo myGeoInfo;
         int myAssetId;
         int myObjectId;
         int myGeoId;
 
-        std::vector<GeometryPart> myParts;
+        std::vector<OutputGeometryPart> myParts;
         
 };
 
diff --git a/GeometryObject.C b/OutputGeometryObject.C
similarity index 88%
rename from GeometryObject.C
rename to OutputGeometryObject.C
index a8a8673d..a9a35882 100644
--- a/GeometryObject.C
+++ b/OutputGeometryObject.C
@@ -3,18 +3,18 @@
 
 #include "Asset.h"
 #include "AssetNode.h"
-#include "GeometryObject.h"
+#include "OutputGeometryObject.h"
 #include "util.h"
-#include "Geo.h"
+#include "OutputGeometry.h"
 
 
 
-GeometryObject::GeometryObject(
+OutputGeometryObject::OutputGeometryObject(
         int assetId,
         int objectId,
         Asset* objectControl
         ) :
-    Object(
+    OutputObject(
             assetId,
             objectId,
             objectControl
@@ -26,14 +26,14 @@ GeometryObject::GeometryObject(
 
     for ( int ii = 0; ii < geoCount; ii++ )
     {	
-        Geo * geo = new Geo( myAssetId, myObjectId, ii, this );
+        OutputGeometry * geo = new OutputGeometry( myAssetId, myObjectId, ii, this );
         myGeos.push_back( geo );
     }
         
 }
 
 
-GeometryObject::~GeometryObject()
+OutputGeometryObject::~OutputGeometryObject()
 {
     for ( int ii = 0; ii < myObjectInfo.geoCount; ii++ )
     {
@@ -43,15 +43,15 @@ GeometryObject::~GeometryObject()
 }
 
 
-Object::ObjectType
-GeometryObject::type()
+OutputObject::ObjectType
+OutputGeometryObject::type()
 {
-    return Object::OBJECT_TYPE_GEOMETRY;
+    return OutputObject::OBJECT_TYPE_GEOMETRY;
 }
 
 
 MStatus
-GeometryObject::compute(
+OutputGeometryObject::compute(
         MDataHandle& objectHandle,
         bool &needToSyncOutputs
         )
@@ -105,7 +105,7 @@ GeometryObject::compute(
 
 
 MStatus
-GeometryObject::setClean(MPlug& plug, MDataBlock& data)
+OutputGeometryObject::setClean(MPlug& plug, MDataBlock& data)
 {
     data.setClean(plug);
 
@@ -127,7 +127,7 @@ GeometryObject::setClean(MPlug& plug, MDataBlock& data)
 
 
 
-void GeometryObject::updateTransform(MDataHandle& handle)
+void OutputGeometryObject::updateTransform(MDataHandle& handle)
 {
     MDataHandle translateHandle = handle.child(AssetNode::outputObjectTranslate);
     MDataHandle rotateHandle = handle.child(AssetNode::outputObjectRotate);
diff --git a/GeometryObject.h b/OutputGeometryObject.h
similarity index 76%
rename from GeometryObject.h
rename to OutputGeometryObject.h
index 430a295f..d5616332 100644
--- a/GeometryObject.h
+++ b/OutputGeometryObject.h
@@ -1,22 +1,22 @@
-#ifndef __GeometryObject_h__
-#define __GeometryObject_h__
+#ifndef __OutputGeometryObject_h__
+#define __OutputGeometryObject_h__
 
-#include "GeometryPart.h"
-#include "Object.h"
+#include "OutputGeometryPart.h"
+#include "OutputObject.h"
 
 #include <vector>
 
-class Geo;
+class OutputGeometry;
 
-class GeometryObject: public Object
+class OutputGeometryObject: public OutputObject
 {
     public:
-        GeometryObject(
+        OutputGeometryObject(
                 int assetId,
                 int objectId,
                 Asset* objectControl
                 );
-        virtual ~GeometryObject();
+        virtual ~OutputGeometryObject();
 
         //MObject createMesh();
 
@@ -42,7 +42,7 @@ class GeometryObject: public Object
     private:
 
         HAPI_Transform myTransformInfo;        
-        std::vector<Geo *> myGeos;
+        std::vector<OutputGeometry *> myGeos;
 
         //HAPI_MaterialInfo materialInfo;
 
diff --git a/GeometryPart.C b/OutputGeometryPart.C
similarity index 98%
rename from GeometryPart.C
rename to OutputGeometryPart.C
index 10f7d41c..5e269a8a 100644
--- a/GeometryPart.C
+++ b/OutputGeometryPart.C
@@ -19,10 +19,10 @@
 
 #include "Asset.h"
 #include "AssetNode.h"
-#include "GeometryPart.h"
+#include "OutputGeometryPart.h"
 #include "util.h"
 
-GeometryPart::GeometryPart(int assetId, int objectId, int geoId, int partId,
+OutputGeometryPart::OutputGeometryPart(int assetId, int objectId, int geoId, int partId,
         HAPI_ObjectInfo objectInfo, HAPI_GeoInfo geoInfo) : 
     myAssetId(assetId),
     myObjectId(objectId),
@@ -60,11 +60,11 @@ GeometryPart::GeometryPart(int assetId, int objectId, int geoId, int partId,
 }
 
 
-GeometryPart::~GeometryPart() {}
+OutputGeometryPart::~OutputGeometryPart() {}
 
 #if MAYA_API_VERSION >= 201400
 void
-GeometryPart::updateVolumeTransform(MDataHandle& handle)
+OutputGeometryPart::updateVolumeTransform(MDataHandle& handle)
 {
     HAPI_Transform transform = myVolumeInfo.transform;
 
@@ -120,7 +120,7 @@ GeometryPart::updateVolumeTransform(MDataHandle& handle)
 #endif
 
 void
-GeometryPart::update()
+OutputGeometryPart::update()
 {
     //if (!geoInfo.hasGeoChanged)
         //return;
@@ -148,7 +148,7 @@ GeometryPart::update()
 
 
 void
-GeometryPart::setGeoInfo(HAPI_GeoInfo& info)
+OutputGeometryPart::setGeoInfo(HAPI_GeoInfo& info)
 {
     myGeoInfo = info;
 }
@@ -199,7 +199,7 @@ getAttributeDataWrapper(
 
 template<typename T>
 bool
-GeometryPart::getAttributeData(
+OutputGeometryPart::getAttributeData(
         std::vector<T> &array,
         const char* name,
         HAPI_AttributeOwner owner
@@ -234,7 +234,7 @@ GeometryPart::getAttributeData(
 }
 
 MStatus
-GeometryPart::compute(
+OutputGeometryPart::compute(
         MDataHandle& handle,
         bool &needToSyncOutputs
         )
@@ -251,7 +251,7 @@ GeometryPart::compute(
 
     if ( myNeverBuilt || myGeoInfo.hasGeoChanged)
     {
-        // Object name
+        // OutputObject name
 	MString partName = Util::getString(myObjectInfo.nameSH) + "/" + Util::getString(myPartInfo.nameSH);
         partNameHandle.set(partName);
 
@@ -326,7 +326,7 @@ GeometryPart::compute(
 }
 
 void
-GeometryPart::createCurves(MDataHandle &curvesHandle)
+OutputGeometryPart::createCurves(MDataHandle &curvesHandle)
 {
     MStatus status;
 
@@ -528,7 +528,7 @@ getParticleArray(
 
 template<typename T, typename U>
 void
-GeometryPart::convertParticleAttribute(
+OutputGeometryPart::convertParticleAttribute(
         MFnArrayAttrsData &arrayDataFn,
         const MString &mayaName,
         U &buffer,
@@ -551,7 +551,7 @@ GeometryPart::convertParticleAttribute(
 }
 
 void
-GeometryPart::createParticle(MDataHandle &dataHandle)
+OutputGeometryPart::createParticle(MDataHandle &dataHandle)
 {
     MDataHandle positionsHandle = dataHandle.child(AssetNode::outputPartParticlePositions);
     MDataHandle arrayDataHandle = dataHandle.child(AssetNode::outputPartParticleArrayData);
@@ -777,7 +777,7 @@ GeometryPart::createParticle(MDataHandle &dataHandle)
 
 #if MAYA_API_VERSION >= 201400
 MObject
-GeometryPart::createVolume()
+OutputGeometryPart::createVolume()
 {
     int xres = myVolumeInfo.xLength;
     int yres = myVolumeInfo.yLength;
@@ -837,7 +837,7 @@ GeometryPart::createVolume()
 #endif
 
 void
-GeometryPart::createMesh(MDataHandle &dataHandle)
+OutputGeometryPart::createMesh(MDataHandle &dataHandle)
 {
     MStatus status;
 
@@ -1115,7 +1115,7 @@ GeometryPart::createMesh(MDataHandle &dataHandle)
 
 
 void
-GeometryPart::updateMaterial(MDataHandle& handle)
+OutputGeometryPart::updateMaterial(MDataHandle& handle)
 {
     MDataHandle matExistsHandle = handle.child(AssetNode::outputPartMaterialExists);
     MDataHandle ambientHandle = handle.child(AssetNode::outputPartAmbientColor);
diff --git a/GeometryPart.h b/OutputGeometryPart.h
similarity index 89%
rename from GeometryPart.h
rename to OutputGeometryPart.h
index e1ea0ad2..c01ce603 100644
--- a/GeometryPart.h
+++ b/OutputGeometryPart.h
@@ -1,5 +1,5 @@
-#ifndef __GeometryPart_h__
-#define __GeometryPart_h__
+#ifndef __OutputGeometryPart_h__
+#define __OutputGeometryPart_h__
 
 #include <maya/MIntArray.h>
 #include <maya/MFloatPointArray.h>
@@ -11,12 +11,12 @@ class Asset;
 
 class MFnArrayAttrsData;
 
-class GeometryPart
+class OutputGeometryPart
 {
     public:        
-        GeometryPart(int assetId, int objectId, int geoId, int partId,
+        OutputGeometryPart(int assetId, int objectId, int geoId, int partId,
                 HAPI_ObjectInfo objectInfo, HAPI_GeoInfo geoInfo);
-        ~GeometryPart();
+        ~OutputGeometryPart();
 
 
         MStatus compute(
diff --git a/InstancerObject.C b/OutputInstancerObject.C
similarity index 92%
rename from InstancerObject.C
rename to OutputInstancerObject.C
index 40cd79ae..e06a88af 100644
--- a/InstancerObject.C
+++ b/OutputInstancerObject.C
@@ -6,15 +6,15 @@
 
 #include "Asset.h"
 #include "AssetNode.h"
-#include "InstancerObject.h"
+#include "OutputInstancerObject.h"
 #include "util.h"
 
-InstancerObject::InstancerObject(
+OutputInstancerObject::OutputInstancerObject(
         int assetId,
         int objectId,
         Asset* objectControl
         ) :
-    Object(
+    OutputObject(
             assetId,
             objectId,
             objectControl
@@ -24,27 +24,27 @@ InstancerObject::InstancerObject(
     //update();
 }
 
-InstancerObject::~InstancerObject() {}
+OutputInstancerObject::~OutputInstancerObject() {}
 
 
-Object::ObjectType
-InstancerObject::type()
+OutputObject::ObjectType
+OutputInstancerObject::type()
 {
-    return Object::OBJECT_TYPE_INSTANCER;
+    return OutputObject::OBJECT_TYPE_INSTANCER;
 }
 
 
 MStringArray
-InstancerObject::getAttributeStringData(HAPI_AttributeOwner owner, MString name)
+OutputInstancerObject::getAttributeStringData(HAPI_AttributeOwner owner, MString name)
 {
     return Util::getAttributeStringData( myAssetId, myObjectId, 0, 0, owner, name );
 }
 
 
 void
-InstancerObject::update()
+OutputInstancerObject::update()
 {
-    Object::update();
+    OutputObject::update();
 
     
     try
@@ -132,7 +132,7 @@ InstancerObject::update()
 
 
 MIntArray
-InstancerObject::getInstancedObjIds()
+OutputInstancerObject::getInstancedObjIds()
 {
     MIntArray ret;
     if ( myObjectInfo.objectToInstanceId >= 0 )
@@ -142,15 +142,15 @@ InstancerObject::getInstancedObjIds()
 
 
 MStringArray
-InstancerObject::getUniqueInstObjNames()
+OutputInstancerObject::getUniqueInstObjNames()
 {
     return myUniqueInstObjNames;
 }
 
 
 MStatus
-//InstancerObject::compute(const MPlug& plug, MDataBlock& data)
-InstancerObject::compute(
+//OutputInstancerObject::compute(const MPlug& plug, MDataBlock& data)
+OutputInstancerObject::compute(
         MDataHandle& handle,
         bool &needToSyncOutputs
         )
@@ -258,7 +258,7 @@ InstancerObject::compute(
         if ( myObjectInfo.objectToInstanceId >= 0 )
         {
             // instancing a single object
-            Object* objToInstance = myObjectControl->findObjectById( myObjectInfo.objectToInstanceId );
+            OutputObject* objToInstance = myObjectControl->findObjectById( myObjectInfo.objectToInstanceId );
             MString name = objToInstance->getName();
 
             MDataHandle h = builder.addElement(0);
@@ -302,7 +302,7 @@ InstancerObject::compute(
 
 
 MStatus
-InstancerObject::setClean(MPlug& plug, MDataBlock& data)
+OutputInstancerObject::setClean(MPlug& plug, MDataBlock& data)
 {
     return MS::kSuccess;
 }
diff --git a/InstancerObject.h b/OutputInstancerObject.h
similarity index 80%
rename from InstancerObject.h
rename to OutputInstancerObject.h
index 9084f72e..1e0ed153 100644
--- a/InstancerObject.h
+++ b/OutputInstancerObject.h
@@ -1,20 +1,20 @@
-#ifndef __InstancerObject_h__
-#define __InstancerObject_h__
+#ifndef __OutputInstancerObject_h__
+#define __OutputInstancerObject_h__
 
 //#include <Maya/MIntArray.h>
 
-#include "Object.h"
+#include "OutputObject.h"
 
 
-class InstancerObject: public Object
+class OutputInstancerObject: public OutputObject
 {
     public:
-        InstancerObject(
+        OutputInstancerObject(
                 int assetId,
                 int objectId,
                 Asset* objectControl
                 );
-        virtual ~InstancerObject();
+        virtual ~OutputInstancerObject();
 
         MIntArray getInstancedObjIds();
         MStringArray getUniqueInstObjNames();
diff --git a/Object.C b/OutputObject.C
similarity index 67%
rename from Object.C
rename to OutputObject.C
index ea3f1432..cba40496 100644
--- a/Object.C
+++ b/OutputObject.C
@@ -5,35 +5,35 @@
 #include <maya/MFnArrayAttrsData.h>
 
 #include "Asset.h"
-#include "GeometryObject.h"
-#include "InstancerObject.h"
-#include "Object.h"
+#include "OutputGeometryObject.h"
+#include "OutputInstancerObject.h"
+#include "OutputObject.h"
 #include "util.h"
 
-Object* 
-Object::createObject(int assetId, int objectId, Asset* objControl)
+OutputObject* 
+OutputObject::createObject(int assetId, int objectId, Asset* objControl)
 {
-    Object* obj;
+    OutputObject* obj;
     
     HAPI_ObjectInfo objInfo;
     //HAPI_GetObjects(assetId, &objInfo, objectId, 1);
     objInfo = objControl->getObjectInfo(objectId);
 
     if (objInfo.isInstancer)
-        obj = new InstancerObject(assetId, objectId, objControl);
+        obj = new OutputInstancerObject(assetId, objectId, objControl);
     else
     {
-        obj = new GeometryObject(assetId, objectId, objControl);
+        obj = new OutputGeometryObject(assetId, objectId, objControl);
     }
 
     return obj;
 }
 
 
-Object::~Object() {}
+OutputObject::~OutputObject() {}
 
 
-Object::Object(
+OutputObject::OutputObject(
         int assetId,
         int objectId,
         Asset* objectControl
@@ -64,12 +64,12 @@ Object::Object(
 
 // Getters ----------------------------------------------------
 
-int Object::getId() { return myObjectId; }
-MString Object::getName() { return Util::getString( myObjectInfo.nameSH); }
+int OutputObject::getId() { return myObjectId; }
+MString OutputObject::getName() { return Util::getString( myObjectInfo.nameSH); }
 
 
 void
-Object::update()
+OutputObject::update()
 {
     HAPI_Result hstat = HAPI_RESULT_SUCCESS;
     myObjectInfo = myObjectControl->getObjectInfo( myObjectId );    
@@ -78,14 +78,14 @@ Object::update()
 
 
 bool	
-Object::isVisible() const
+OutputObject::isVisible() const
 {
     return myObjectInfo.isVisible;
 }
 
 
 bool	
-Object::isInstanced() const
+OutputObject::isInstanced() const
 {
     return myIsInstanced;
 }
diff --git a/Object.h b/OutputObject.h
similarity index 89%
rename from Object.h
rename to OutputObject.h
index afea5231..adb9a0a4 100644
--- a/Object.h
+++ b/OutputObject.h
@@ -1,5 +1,5 @@
-#ifndef __Object_h__
-#define __Object_h__
+#ifndef __OutputObject_h__
+#define __OutputObject_h__
 
 #include <maya/MStatus.h>
 #include <maya/MFloatArray.h>
@@ -15,7 +15,7 @@
 
 class Asset;
 
-class Object {
+class OutputObject {
 
 
     public:
@@ -25,18 +25,18 @@ class Object {
         };
 
         // static creator
-        static Object* createObject(
+        static OutputObject* createObject(
                 int assetId,
                 int objectId,
                 Asset* objectControl
                 );
 
-        Object(
+        OutputObject(
                 int assetId,
                 int objectId,
                 Asset* objectControl
               );
-        virtual ~Object();
+        virtual ~OutputObject();
 
         int getId();
         MString getName();
diff --git a/AssetSyncAttribute.C b/SyncAttribute.C
similarity index 98%
rename from AssetSyncAttribute.C
rename to SyncAttribute.C
index 69d54d30..45a0a946 100644
--- a/AssetSyncAttribute.C
+++ b/SyncAttribute.C
@@ -1,4 +1,4 @@
-#include "AssetSyncAttribute.h"
+#include "SyncAttribute.h"
 
 #include <maya/MFnCompoundAttribute.h>
 #include <maya/MFnEnumAttribute.h>
@@ -387,7 +387,7 @@ CreateAttrOperation::createEnumAttr(const HAPI_ParmInfo &parm)
     return result;
 }
 
-AssetSyncAttribute::AssetSyncAttribute(
+SyncAttribute::SyncAttribute(
         const MObject &assetNodeObj
         ) :
     myAssetNodeObj(assetNodeObj)
@@ -398,12 +398,12 @@ AssetSyncAttribute::AssetSyncAttribute(
     myNodeInfo = assetNode->getAsset()->myNodeInfo;
 }
 
-AssetSyncAttribute::~AssetSyncAttribute()
+SyncAttribute::~SyncAttribute()
 {
 }
 
 MStatus
-AssetSyncAttribute::doIt()
+SyncAttribute::doIt()
 {
     MStatus status;
 
@@ -465,7 +465,7 @@ AssetSyncAttribute::doIt()
 }
 
 MStatus
-AssetSyncAttribute::undoIt()
+SyncAttribute::undoIt()
 {
     MStatus status;
 
@@ -476,7 +476,7 @@ AssetSyncAttribute::undoIt()
 }
 
 MStatus
-AssetSyncAttribute::redoIt()
+SyncAttribute::redoIt()
 {
     MStatus status;
 
@@ -487,7 +487,7 @@ AssetSyncAttribute::redoIt()
 }
 
 bool
-AssetSyncAttribute::isUndoable() const
+SyncAttribute::isUndoable() const
 {
     return true;
 }
diff --git a/AssetSyncAttribute.h b/SyncAttribute.h
similarity index 71%
rename from AssetSyncAttribute.h
rename to SyncAttribute.h
index d6bbbeeb..c6911532 100644
--- a/AssetSyncAttribute.h
+++ b/SyncAttribute.h
@@ -1,5 +1,5 @@
-#ifndef __AssetSyncAttribute_h__
-#define __AssetSyncAttribute_h__
+#ifndef __SyncAttribute_h__
+#define __SyncAttribute_h__
 
 #include "AssetSubCommand.h"
 
@@ -10,13 +10,13 @@
 
 class MFnCompoundAttribute;
 
-class AssetSyncAttribute : public AssetSubCommand
+class SyncAttribute : public AssetSubCommand
 {
     public:
-	AssetSyncAttribute(
+	SyncAttribute(
 		const MObject &assetNodeObj
 		);
-	virtual ~AssetSyncAttribute();
+	virtual ~SyncAttribute();
 
 	virtual MStatus doIt();
 	virtual MStatus undoIt();
diff --git a/AssetSyncOutputGeoPart.C b/SyncOutputGeometryPart.C
similarity index 95%
rename from AssetSyncOutputGeoPart.C
rename to SyncOutputGeometryPart.C
index 96050e27..da6fd2e0 100644
--- a/AssetSyncOutputGeoPart.C
+++ b/SyncOutputGeometryPart.C
@@ -1,4 +1,4 @@
-#include "AssetSyncOutputGeoPart.h"
+#include "SyncOutputGeometryPart.h"
 
 #include <maya/MDagPath.h>
 #include <maya/MGlobal.h>
@@ -10,7 +10,7 @@
 #include "AssetNode.h"
 #include "util.h"
 
-AssetSyncOutputGeoPart::AssetSyncOutputGeoPart(
+SyncOutputGeometryPart::SyncOutputGeometryPart(
 	const MPlug &outputPlug,
 	const MObject &objectTransform
 	) :
@@ -19,12 +19,12 @@ AssetSyncOutputGeoPart::AssetSyncOutputGeoPart(
 {
 }
 
-AssetSyncOutputGeoPart::~AssetSyncOutputGeoPart()
+SyncOutputGeometryPart::~SyncOutputGeometryPart()
 {
 }
 
 MStatus
-AssetSyncOutputGeoPart::doIt()
+SyncOutputGeometryPart::doIt()
 {
     MStatus status;
     
@@ -65,7 +65,7 @@ AssetSyncOutputGeoPart::doIt()
 }
 
 MStatus
-AssetSyncOutputGeoPart::undoIt()
+SyncOutputGeometryPart::undoIt()
 {
     MStatus status;
 
@@ -76,7 +76,7 @@ AssetSyncOutputGeoPart::undoIt()
 }
 
 MStatus
-AssetSyncOutputGeoPart::redoIt()
+SyncOutputGeometryPart::redoIt()
 {
     MStatus status;
 
@@ -87,13 +87,13 @@ AssetSyncOutputGeoPart::redoIt()
 }
 
 bool
-AssetSyncOutputGeoPart::isUndoable() const
+SyncOutputGeometryPart::isUndoable() const
 {
     return true;
 }
 
 MStatus
-AssetSyncOutputGeoPart::createOutputPart(
+SyncOutputGeometryPart::createOutputPart(
 	const MObject &objectTransform,
 	const MString &partName,
 	MObject &partTransform
@@ -158,7 +158,7 @@ AssetSyncOutputGeoPart::createOutputPart(
 }
 
 MStatus
-AssetSyncOutputGeoPart::createOutputCurves(
+SyncOutputGeometryPart::createOutputCurves(
 	MPlug curvesPlug,
 	const MObject &partTransform,
 	bool isBezier
@@ -187,7 +187,7 @@ AssetSyncOutputGeoPart::createOutputCurves(
 }
 
 MStatus
-AssetSyncOutputGeoPart::createOutputMaterial(
+SyncOutputGeometryPart::createOutputMaterial(
 	const MPlug &materialPlug,
 	const MObject &partTransform
 	)
@@ -287,7 +287,7 @@ AssetSyncOutputGeoPart::createOutputMaterial(
 }
 
 MStatus
-AssetSyncOutputGeoPart::createOutputParticle(
+SyncOutputGeometryPart::createOutputParticle(
 	const MObject &partTransform,
 	const MPlug &particlePlug
 	)
diff --git a/AssetSyncOutputGeoPart.h b/SyncOutputGeometryPart.h
similarity index 83%
rename from AssetSyncOutputGeoPart.h
rename to SyncOutputGeometryPart.h
index 51b0f890..cf2f6701 100644
--- a/AssetSyncOutputGeoPart.h
+++ b/SyncOutputGeometryPart.h
@@ -1,19 +1,19 @@
-#ifndef __AssetSyncOutputGeoPart_h__
-#define __AssetSyncOutputGeoPart_h__
+#ifndef __SyncOutputGeometryPart_h__
+#define __SyncOutputGeometryPart_h__
 
 #include <maya/MDagModifier.h>
 #include <maya/MPlug.h>
 
 #include "AssetSubCommand.h"
 
-class AssetSyncOutputGeoPart : public AssetSubCommand
+class SyncOutputGeometryPart : public AssetSubCommand
 {
     public:
-	AssetSyncOutputGeoPart(
+	SyncOutputGeometryPart(
 		const MPlug &outputPlug,
 		const MObject & objectTransform		
 		);
-	virtual ~AssetSyncOutputGeoPart();
+	virtual ~SyncOutputGeometryPart();
 
 	virtual MStatus doIt();
 	virtual MStatus undoIt();
diff --git a/AssetSyncOutputInstance.C b/SyncOutputInstance.C
similarity index 92%
rename from AssetSyncOutputInstance.C
rename to SyncOutputInstance.C
index 0a216412..df7f6375 100644
--- a/AssetSyncOutputInstance.C
+++ b/SyncOutputInstance.C
@@ -1,4 +1,4 @@
-#include "AssetSyncOutputInstance.h"
+#include "SyncOutputInstance.h"
 
 #include <maya/MDagModifier.h>
 #include <maya/MDagPath.h>
@@ -10,7 +10,7 @@
 #include "AssetNode.h"
 #include "util.h"
 
-AssetSyncOutputInstance::AssetSyncOutputInstance(
+SyncOutputInstance::SyncOutputInstance(
 	const MPlug &outputPlug,
 	const int parentMultiIndex,
 	const MObject &assetNodeObj
@@ -21,12 +21,12 @@ AssetSyncOutputInstance::AssetSyncOutputInstance(
 {
 }
 
-AssetSyncOutputInstance::~AssetSyncOutputInstance()
+SyncOutputInstance::~SyncOutputInstance()
 {
 }
 
 MStatus
-AssetSyncOutputInstance::doIt()
+SyncOutputInstance::doIt()
 {
     MStatus status;
 
@@ -37,7 +37,7 @@ AssetSyncOutputInstance::doIt()
 }
 
 MStatus
-AssetSyncOutputInstance::undoIt()
+SyncOutputInstance::undoIt()
 {
     MStatus status;
 
@@ -48,7 +48,7 @@ AssetSyncOutputInstance::undoIt()
 }
 
 MStatus
-AssetSyncOutputInstance::redoIt()
+SyncOutputInstance::redoIt()
 {
     MStatus status;
 
@@ -59,13 +59,13 @@ AssetSyncOutputInstance::redoIt()
 }
 
 bool
-AssetSyncOutputInstance::isUndoable() const
+SyncOutputInstance::isUndoable() const
 {
     return true;
 }
 
 void 
-AssetSyncOutputInstance::instanceObject( MDagPath & objToInstance,
+SyncOutputInstance::instanceObject( MDagPath & objToInstance,
 					 MObject instancerTransform,
 					  int pointIndex )
 {
@@ -93,7 +93,7 @@ AssetSyncOutputInstance::instanceObject( MDagPath & objToInstance,
 }
 
 bool 
-AssetSyncOutputInstance::stringStartsWith( const MString & string, const MString & startsWith )
+SyncOutputInstance::stringStartsWith( const MString & string, const MString & startsWith )
 {
     if( string.length() >= startsWith.length() )
     {
@@ -106,7 +106,7 @@ AssetSyncOutputInstance::stringStartsWith( const MString & string, const MString
 }
 
 bool 
-AssetSyncOutputInstance::instanceObjects( MObject searchRoot,
+SyncOutputInstance::instanceObjects( MObject searchRoot,
 					  MObject instancerTransform,
 					  int pointIndex,
 					  const MString & objectToInstanceName,
@@ -161,7 +161,7 @@ AssetSyncOutputInstance::instanceObjects( MObject searchRoot,
 }
 
 MStatus
-AssetSyncOutputInstance::createOutput()
+SyncOutputInstance::createOutput()
 {
     MStatus status;
 
diff --git a/AssetSyncOutputInstance.h b/SyncOutputInstance.h
similarity index 85%
rename from AssetSyncOutputInstance.h
rename to SyncOutputInstance.h
index 65107fb3..b4bcbb92 100644
--- a/AssetSyncOutputInstance.h
+++ b/SyncOutputInstance.h
@@ -1,5 +1,5 @@
-#ifndef __AssetSyncOutputInstance_h__
-#define __AssetSyncOutputInstance_h__
+#ifndef __SyncOutputInstance_h__
+#define __SyncOutputInstance_h__
 
 #include <maya/MDagModifier.h>
 #include <maya/MPlug.h>
@@ -8,15 +8,15 @@
 
 class MDagPath;
 
-class AssetSyncOutputInstance : public AssetSubCommand
+class SyncOutputInstance : public AssetSubCommand
 {
     public:
-	AssetSyncOutputInstance(
+	SyncOutputInstance(
 		const MPlug &outputPlug,
 		const int parentMultiIndex,
 		const MObject &assetNodeObj
 		);
-	virtual ~AssetSyncOutputInstance();
+	virtual ~SyncOutputInstance();
 
 	virtual MStatus doIt();
 	virtual MStatus undoIt();
diff --git a/AssetSyncOutputObject.C b/SyncOutputObject.C
similarity index 95%
rename from AssetSyncOutputObject.C
rename to SyncOutputObject.C
index 430764b0..49d4b8ab 100644
--- a/AssetSyncOutputObject.C
+++ b/SyncOutputObject.C
@@ -1,4 +1,4 @@
-#include "AssetSyncOutputObject.h"
+#include "SyncOutputObject.h"
 
 #include <maya/MFloatArray.h>
 #include <maya/MGlobal.h>
@@ -9,14 +9,14 @@
 #include <maya/MDagPath.h>
 
 #include "AssetNode.h"
-#include "AssetSyncOutputGeoPart.h"
-#include "AssetSyncOutputInstance.h"
+#include "SyncOutputGeometryPart.h"
+#include "SyncOutputInstance.h"
 
 #if MAYA_API_VERSION >= 201400
 	#include <maya/MFnFloatArrayData.h>
 #endif
 
-AssetSyncOutputObject::AssetSyncOutputObject(
+SyncOutputObject::SyncOutputObject(
 	const MPlug &outputPlug,
 	const MObject &assetNodeObj,
 	const bool visible,
@@ -27,7 +27,7 @@ AssetSyncOutputObject::AssetSyncOutputObject(
       mySyncTemplatedGeos( syncTemplatedGeos )
 {}
 
-AssetSyncOutputObject::~AssetSyncOutputObject()
+SyncOutputObject::~SyncOutputObject()
 {
     for(AssetSyncs::const_iterator it = myAssetSyncs.begin();
 	    it != myAssetSyncs.end();
@@ -39,7 +39,7 @@ AssetSyncOutputObject::~AssetSyncOutputObject()
 }
 
 MStatus
-AssetSyncOutputObject::doIt()
+SyncOutputObject::doIt()
 {
     MStatus status;
     // Create our parts.
@@ -131,7 +131,7 @@ AssetSyncOutputObject::doIt()
             CHECK_MSTATUS_AND_RETURN_IT(status);
             for (int jj=0; jj<partCount; jj++)
             {
-	        AssetSubCommand* sync = new AssetSyncOutputGeoPart(partsPlug[jj], partParent );
+	        AssetSubCommand* sync = new SyncOutputGeometryPart(partsPlug[jj], partParent );
 	        sync->doIt();
 	        myAssetSyncs.push_back(sync);
             }
@@ -147,7 +147,7 @@ AssetSyncOutputObject::doIt()
 
 #if MAYA_API_VERSION >= 201400
 MStatus
-AssetSyncOutputObject::createFluidShapeNode(MObject& transform, MObject& fluid)
+SyncOutputObject::createFluidShapeNode(MObject& transform, MObject& fluid)
 {
     MStatus status;
     transform = myDagModifier.createNode("transform", myAssetNodeObj, &status);
@@ -163,7 +163,7 @@ AssetSyncOutputObject::createFluidShapeNode(MObject& transform, MObject& fluid)
 }
 
 MStatus
-AssetSyncOutputObject::createVelocityConverter(MObject& velocityConverter)
+SyncOutputObject::createVelocityConverter(MObject& velocityConverter)
 {
     if (!velocityConverter.isNull())
 	return MS::kSuccess;
@@ -175,7 +175,7 @@ AssetSyncOutputObject::createVelocityConverter(MObject& velocityConverter)
 }
 
 bool
-AssetSyncOutputObject::resolutionsEqual(MPlug resA, MPlug resB)
+SyncOutputObject::resolutionsEqual(MPlug resA, MPlug resB)
 {
     MPlug resAPlug = resA.child(AssetNode::outputPartVolumeRes);
     MObject resAObj;
@@ -196,7 +196,7 @@ AssetSyncOutputObject::resolutionsEqual(MPlug resA, MPlug resB)
 
 
 MStatus
-AssetSyncOutputObject::createFluidShape()
+SyncOutputObject::createFluidShape()
 {
     MStatus status;
 
@@ -418,7 +418,7 @@ AssetSyncOutputObject::createFluidShape()
 #endif
 
 MStatus
-AssetSyncOutputObject::undoIt()
+SyncOutputObject::undoIt()
 {
     for(AssetSyncs::reverse_iterator iter = myAssetSyncs.rbegin();
 	    iter != myAssetSyncs.rend();
@@ -432,7 +432,7 @@ AssetSyncOutputObject::undoIt()
 }
 
 MStatus
-AssetSyncOutputObject::redoIt()
+SyncOutputObject::redoIt()
 {
     myDagModifier.doIt();
     for(AssetSyncs::iterator iter = myAssetSyncs.begin();
@@ -446,7 +446,7 @@ AssetSyncOutputObject::redoIt()
 }
 
 bool
-AssetSyncOutputObject::isUndoable() const
+SyncOutputObject::isUndoable() const
 {
     return true;
 }
diff --git a/AssetSyncOutputObject.h b/SyncOutputObject.h
similarity index 78%
rename from AssetSyncOutputObject.h
rename to SyncOutputObject.h
index 53b633a4..41b396b0 100644
--- a/AssetSyncOutputObject.h
+++ b/SyncOutputObject.h
@@ -1,5 +1,5 @@
-#ifndef __AssetSyncOutputObject_h__
-#define __AssetSyncOutputObject_h__
+#ifndef __SyncOutputObject_h__
+#define __SyncOutputObject_h__
 
 #include <vector>
 
@@ -8,16 +8,16 @@
 
 #include "AssetSubCommand.h"
 
-class AssetSyncOutputObject : public AssetSubCommand
+class SyncOutputObject : public AssetSubCommand
 {
     public:
-	AssetSyncOutputObject(
+	SyncOutputObject(
 		const MPlug &outputPlug,
 		const MObject &assetNodeObj,
 		const bool visible,
                 const bool syncTemplatedGeos
 		);
-	virtual ~AssetSyncOutputObject();
+	virtual ~SyncOutputObject();
 
 	virtual MStatus doIt();
 	virtual MStatus undoIt();
@@ -39,7 +39,7 @@ class AssetSyncOutputObject : public AssetSubCommand
 
 	MDagModifier myDagModifier;
 
-	// TODO: change this into an AssetSyncOutputGeoPart
+	// TODO: change this into an SyncOutputGeometryPart
 	typedef std::vector<AssetSubCommand*> AssetSyncs;
 	AssetSyncs myAssetSyncs;
 };
diff --git a/houdiniEnginePlugin.vcxproj b/houdiniEnginePlugin.vcxproj
index 21377650..5ce5cff1 100644
--- a/houdiniEnginePlugin.vcxproj
+++ b/houdiniEnginePlugin.vcxproj
@@ -38,51 +38,51 @@
   <ItemGroup>
     <ClCompile Include="Asset.C" />
     <ClCompile Include="AssetCommand.C" />
-    <ClCompile Include="AssetInput.C" />
-    <ClCompile Include="AssetInputAsset.C" />
-    <ClCompile Include="AssetInputCurve.C" />
-    <ClCompile Include="AssetInputMesh.C" />
-    <ClCompile Include="AssetInputParticle.C" />
+    <ClCompile Include="Input.C" />
+    <ClCompile Include="InputAsset.C" />
+    <ClCompile Include="InputCurve.C" />
+    <ClCompile Include="InputMesh.C" />
+    <ClCompile Include="InputParticle.C" />
     <ClCompile Include="AssetNode.C" />
     <ClCompile Include="AssetSubCommand.C" />
     <ClCompile Include="AssetSubCommandLoadAsset.C" />
     <ClCompile Include="AssetSubCommandSync.C" />
-    <ClCompile Include="AssetSyncAttribute.C" />
-    <ClCompile Include="AssetSyncOutputGeoPart.C" />
-    <ClCompile Include="AssetSyncOutputInstance.C" />
-    <ClCompile Include="AssetSyncOutputObject.C" />
+    <ClCompile Include="SyncAttribute.C" />
+    <ClCompile Include="SyncOutputGeometryPart.C" />
+    <ClCompile Include="SyncOutputInstance.C" />
+    <ClCompile Include="SyncOutputObject.C" />
     <ClCompile Include="FluidVelocityConvert.C" />
-    <ClCompile Include="Geo.C" />
-    <ClCompile Include="GeometryObject.C" />
-    <ClCompile Include="GeometryPart.C" />
-    <ClCompile Include="InstancerObject.C" />
-    <ClCompile Include="Object.C" />
+    <ClCompile Include="OutputGeometry.C" />
+    <ClCompile Include="OutputGeometryObject.C" />
+    <ClCompile Include="OutputGeometryPart.C" />
+    <ClCompile Include="OutputInstancerObject.C" />
+    <ClCompile Include="OutputObject.C" />
     <ClCompile Include="plugin.C" />
     <ClCompile Include="util.C" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Asset.h" />
     <ClInclude Include="AssetCommand.h" />
-    <ClInclude Include="AssetInput.h" />
-    <ClInclude Include="AssetInputAsset.h" />
-    <ClInclude Include="AssetInputCurve.h" />
-    <ClInclude Include="AssetInputMesh.h" />
+    <ClInclude Include="Input.h" />
+    <ClInclude Include="InputAsset.h" />
+    <ClInclude Include="InputCurve.h" />
+    <ClInclude Include="InputMesh.h" />
     <ClInclude Include="assetinputparticle.h" />
     <ClInclude Include="AssetNode.h" />
     <ClInclude Include="AssetSubCommand.h" />
     <ClInclude Include="AssetSubCommandLoadAsset.h" />
     <ClInclude Include="AssetSubCommandSync.h" />
-    <ClInclude Include="AssetSyncAttribute.h" />
-    <ClInclude Include="AssetSyncOutputGeoPart.h" />
-    <ClInclude Include="AssetSyncOutputInstance.h" />
-    <ClInclude Include="AssetSyncOutputObject.h" />
+    <ClInclude Include="SyncAttribute.h" />
+    <ClInclude Include="SyncOutputGeometryPart.h" />
+    <ClInclude Include="SyncOutputInstance.h" />
+    <ClInclude Include="SyncOutputObject.h" />
     <ClInclude Include="FluidVelocityConvert.h" />
-    <ClInclude Include="Geo.h" />
-    <ClInclude Include="GeometryObject.h" />
-    <ClInclude Include="GeometryPart.h" />
-    <ClInclude Include="InstancerObject.h" />
+    <ClInclude Include="OutputGeometry.h" />
+    <ClInclude Include="OutputGeometryObject.h" />
+    <ClInclude Include="OutputGeometryPart.h" />
+    <ClInclude Include="OutputInstancerObject.h" />
     <ClInclude Include="MayaTypeID.h" />
-    <ClInclude Include="Object.h" />
+    <ClInclude Include="OutputObject.h" />
     <ClInclude Include="util.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">