diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp
index ca121b9a14..32d0bd5e92 100644
--- a/stepmania/src/Actor.cpp
+++ b/stepmania/src/Actor.cpp
@@ -22,7 +22,7 @@ class HiddenActor: public Actor
 {
 public:
 	HiddenActor() { SetHidden(true); }
-	virtual Actor *Copy() const;
+	virtual HiddenActor *Copy() const;
 };
 REGISTER_ACTOR_CLASS_WITH_NAME( HiddenActor, Actor )
 
diff --git a/stepmania/src/ActorFrame.cpp b/stepmania/src/ActorFrame.cpp
index a0a25dfdec..e206138808 100644
--- a/stepmania/src/ActorFrame.cpp
+++ b/stepmania/src/ActorFrame.cpp
@@ -17,7 +17,7 @@
  */
 //REGISTER_ACTOR_CLASS( ActorFrame )
 REGISTER_ACTOR_CLASS_WITH_NAME( ActorFrameAutoDeleteChildren, ActorFrame )
-Actor *ActorFrame::Copy() const { return new ActorFrame(*this); }
+ActorFrame *ActorFrame::Copy() const { return new ActorFrame(*this); }
 
 
 ActorFrame::ActorFrame()
diff --git a/stepmania/src/ActorFrame.h b/stepmania/src/ActorFrame.h
index ed09f3a7d7..fc6e47254d 100644
--- a/stepmania/src/ActorFrame.h
+++ b/stepmania/src/ActorFrame.h
@@ -14,7 +14,7 @@ public:
 
 	virtual void InitState();
 	void LoadFromNode( const XNode* pNode );
-	virtual Actor *Copy() const;
+	virtual ActorFrame *Copy() const;
 
 	virtual void AddChild( Actor* pActor );
 	virtual void RemoveChild( Actor* pActor );
@@ -89,7 +89,7 @@ class ActorFrameAutoDeleteChildren : public ActorFrame
 public:
 	ActorFrameAutoDeleteChildren() { DeleteChildrenWhenDone(true); }
 	virtual bool AutoLoadChildren() const { return true; }
-	virtual Actor *Copy() const;
+	virtual ActorFrameAutoDeleteChildren *Copy() const;
 };
 
 #endif
diff --git a/stepmania/src/ActorFrameTexture.cpp b/stepmania/src/ActorFrameTexture.cpp
index 535d026857..50768d2548 100644
--- a/stepmania/src/ActorFrameTexture.cpp
+++ b/stepmania/src/ActorFrameTexture.cpp
@@ -5,7 +5,7 @@
 #include "ActorUtil.h"
 
 REGISTER_ACTOR_CLASS_WITH_NAME( ActorFrameTextureAutoDeleteChildren, ActorFrameTexture )
-Actor *ActorFrameTexture::Copy() const { return new ActorFrameTexture(*this); }
+ActorFrameTexture *ActorFrameTexture::Copy() const { return new ActorFrameTexture(*this); }
 
 ActorFrameTexture::ActorFrameTexture()
 {
diff --git a/stepmania/src/ActorFrameTexture.h b/stepmania/src/ActorFrameTexture.h
index 85fcf6a08d..06370fd84c 100644
--- a/stepmania/src/ActorFrameTexture.h
+++ b/stepmania/src/ActorFrameTexture.h
@@ -10,7 +10,7 @@ public:
 	ActorFrameTexture();
 	ActorFrameTexture( const ActorFrameTexture &cpy );
 	virtual ~ActorFrameTexture();
-	virtual Actor *Copy() const;
+	virtual ActorFrameTexture *Copy() const;
 
 	/* Set the texture name, which can be used with RageTextureManager (and users,
 	 * eg. Sprite) to load the texture.  If no name is supplied, a unique one will
@@ -46,7 +46,7 @@ class ActorFrameTextureAutoDeleteChildren : public ActorFrameTexture
 public:
 	ActorFrameTextureAutoDeleteChildren() { DeleteChildrenWhenDone(true); }
 	virtual bool AutoLoadChildren() const { return true; }
-	virtual Actor *Copy() const;
+	virtual ActorFrameTextureAutoDeleteChildren *Copy() const;
 };
 
 #endif
diff --git a/stepmania/src/ActorProxy.h b/stepmania/src/ActorProxy.h
index 8290cc463b..434605ff0e 100644
--- a/stepmania/src/ActorProxy.h
+++ b/stepmania/src/ActorProxy.h
@@ -16,7 +16,7 @@ public:
 	virtual void DrawPrimitives();
 
 	void LoadFromNode( const XNode* pNode );
-	virtual Actor *Copy() const;
+	virtual ActorProxy *Copy() const;
 
 	Actor *GetTarget() { return m_pActorTarget; }
 	void SetTarget( Actor *pTarget ) { m_pActorTarget = pTarget; }
diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp
index 2a71c3cdeb..abeb62af81 100644
--- a/stepmania/src/ActorScroller.cpp
+++ b/stepmania/src/ActorScroller.cpp
@@ -15,7 +15,7 @@
  */
 //REGISTER_ACTOR_CLASS( ActorScroller )
 REGISTER_ACTOR_CLASS_WITH_NAME( ActorScrollerAutoDeleteChildren, ActorScroller )
-Actor *ActorScroller::Copy() const { return new ActorScroller(*this); }
+ActorScroller *ActorScroller::Copy() const { return new ActorScroller(*this); }
 
 
 ActorScroller::ActorScroller()
diff --git a/stepmania/src/ActorScroller.h b/stepmania/src/ActorScroller.h
index d890ea4020..aff47f9846 100644
--- a/stepmania/src/ActorScroller.h
+++ b/stepmania/src/ActorScroller.h
@@ -28,7 +28,7 @@ public:
 	void PositionItems();
 
 	void LoadFromNode( const XNode *pNode );
-	virtual Actor *Copy() const;
+	virtual ActorScroller *Copy() const;
 	
 	void SetLoop( bool bLoop )					{ m_bLoop = bLoop; }
 	void SetNumItemsToDraw( float fNumItemsToDraw )			{ m_fNumItemsToDraw = fNumItemsToDraw; }
@@ -79,7 +79,7 @@ class ActorScrollerAutoDeleteChildren : public ActorScroller
 public:
 	ActorScrollerAutoDeleteChildren() { DeleteChildrenWhenDone(true); }
 	virtual bool AutoLoadChildren() const { return true; }
-	virtual Actor *Copy() const;
+	virtual ActorScrollerAutoDeleteChildren *Copy() const;
 };
 
 #endif
diff --git a/stepmania/src/ActorSound.h b/stepmania/src/ActorSound.h
index 1b43c490b9..9264427693 100644
--- a/stepmania/src/ActorSound.h
+++ b/stepmania/src/ActorSound.h
@@ -10,7 +10,7 @@ class ActorSound: public Actor
 {
 public:
 	virtual ~ActorSound() { }
-	virtual Actor *Copy() const;
+	virtual ActorSound *Copy() const;
 
 	void Load( const RString &sPath );
 	void Play();
diff --git a/stepmania/src/ActorUtil.h b/stepmania/src/ActorUtil.h
index 2a22f9e4be..b2ee9a1698 100644
--- a/stepmania/src/ActorUtil.h
+++ b/stepmania/src/ActorUtil.h
@@ -19,7 +19,7 @@ Actor *CreateActor() { return new T; }
 		Register##className() { ActorUtil::Register(#externalClassName, CreateActor<className>); } \
 	}; \
 	static Register##className register##className; \
-	Actor *className::Copy() const { return new className(*this); }
+	className *className::Copy() const { return new className(*this); }
 
 #define REGISTER_ACTOR_CLASS( className ) REGISTER_ACTOR_CLASS_WITH_NAME( className, className )
 
diff --git a/stepmania/src/BGAnimation.h b/stepmania/src/BGAnimation.h
index 8c22786831..012e2f9df4 100644
--- a/stepmania/src/BGAnimation.h
+++ b/stepmania/src/BGAnimation.h
@@ -16,7 +16,7 @@ public:
 	void LoadFromAniDir( const RString &sAniDir );
 	void LoadFromNode( const XNode* pNode );
 
-	virtual Actor *Copy() const;
+	virtual BGAnimation *Copy() const;
 
 protected:
 	void AddLayersFromAniDir( const RString &_sAniDir, const XNode *pNode );
diff --git a/stepmania/src/BPMDisplay.h b/stepmania/src/BPMDisplay.h
index f11984dc11..49d312838e 100644
--- a/stepmania/src/BPMDisplay.h
+++ b/stepmania/src/BPMDisplay.h
@@ -15,7 +15,7 @@ class BPMDisplay : public BitmapText
 {
 public:
 	BPMDisplay();
-	virtual Actor *Copy() const;
+	virtual BPMDisplay *Copy() const;
 	void Load();
 	virtual void Update( float fDeltaTime ); 
 	void LoadFromNode( const XNode *pNode );
diff --git a/stepmania/src/Banner.h b/stepmania/src/Banner.h
index 41665d3736..c56acaef99 100644
--- a/stepmania/src/Banner.h
+++ b/stepmania/src/Banner.h
@@ -15,7 +15,7 @@ class Banner : public Sprite
 public:
 	Banner();
 	virtual ~Banner() { }
-	virtual Actor *Copy() const;
+	virtual Banner *Copy() const;
 
 	void Load( RageTextureID ID, bool bIsBanner );
 	virtual void Load( RageTextureID ID ) { Load( ID, true ); }
diff --git a/stepmania/src/BitmapText.h b/stepmania/src/BitmapText.h
index c15c8e9f16..e123cf8a0b 100644
--- a/stepmania/src/BitmapText.h
+++ b/stepmania/src/BitmapText.h
@@ -17,7 +17,7 @@ public:
 	virtual ~BitmapText();
 
 	virtual void LoadFromNode( const XNode* pNode );
-	virtual Actor *Copy() const;
+	virtual BitmapText *Copy() const;
 
 	bool LoadFromFont( const RString& sFontName );
 	bool LoadFromTextureAndChars( const RString& sTexturePath, const RString& sChars );
diff --git a/stepmania/src/ComboGraph.h b/stepmania/src/ComboGraph.h
index 37a00f3690..c87c72574f 100644
--- a/stepmania/src/ComboGraph.h
+++ b/stepmania/src/ComboGraph.h
@@ -13,7 +13,7 @@ public:
 	ComboGraph();
 	void Load( const StageStats &s, const PlayerStageStats &pss );
 	virtual void LoadFromNode( const XNode* pNode );
-	virtual Actor *Copy() const;
+	virtual ComboGraph *Copy() const;
 	virtual bool AutoLoadChildren() const { return true; }
 
 	//
diff --git a/stepmania/src/ControllerStateDisplay.h b/stepmania/src/ControllerStateDisplay.h
index b6eb545b2e..a9df6b089b 100644
--- a/stepmania/src/ControllerStateDisplay.h
+++ b/stepmania/src/ControllerStateDisplay.h
@@ -29,7 +29,7 @@ public:
 	virtual void Update( float fDelta );
 	bool IsLoaded() const { return m_bIsLoaded; }
 
-	virtual Actor *Copy() const;
+	virtual ControllerStateDisplay *Copy() const;
 
 	//
 	// Lua
diff --git a/stepmania/src/CourseContentsList.h b/stepmania/src/CourseContentsList.h
index b71eff387b..3e665f022d 100644
--- a/stepmania/src/CourseContentsList.h
+++ b/stepmania/src/CourseContentsList.h
@@ -11,7 +11,7 @@ class CourseContentsList : public ActorScroller
 public:
 	CourseContentsList();
 	~CourseContentsList();
-	virtual Actor *Copy() const;
+	virtual CourseContentsList *Copy() const;
 	
 	void Load();
 	void LoadFromNode( const XNode* pNode );
diff --git a/stepmania/src/CourseEntryDisplay.h b/stepmania/src/CourseEntryDisplay.h
index 18aa2fb62c..80a085dfcf 100644
--- a/stepmania/src/CourseEntryDisplay.h
+++ b/stepmania/src/CourseEntryDisplay.h
@@ -16,7 +16,7 @@ class CourseEntryDisplay : public ActorFrame
 {
 public:
 	CourseEntryDisplay();
-	virtual Actor *Copy() const;
+	virtual CourseEntryDisplay *Copy() const;
 
 	void Load();
 	void LoadFromNode( const XNode* pNode );
diff --git a/stepmania/src/DifficultyIcon.h b/stepmania/src/DifficultyIcon.h
index ad71269f6c..80e7d3437f 100644
--- a/stepmania/src/DifficultyIcon.h
+++ b/stepmania/src/DifficultyIcon.h
@@ -20,7 +20,7 @@ public:
 	bool Load( RString sFilePath );
 	virtual void Load( RageTextureID ID ) { Load( ID.filename ); }
 	virtual void LoadFromNode( const XNode* pNode );
-	virtual Actor *Copy() const;
+	virtual DifficultyIcon *Copy() const;
 
 	void SetPlayer( PlayerNumber pn );
 	void Unset();
diff --git a/stepmania/src/DifficultyList.h b/stepmania/src/DifficultyList.h
index 8132a9beb9..c2c0238f73 100644
--- a/stepmania/src/DifficultyList.h
+++ b/stepmania/src/DifficultyList.h
@@ -16,7 +16,7 @@ class DifficultyList: public ActorFrame
 public:
 	DifficultyList();
 	virtual ~DifficultyList();
-	virtual Actor *Copy() const;
+	virtual DifficultyList *Copy() const;
 	virtual void LoadFromNode( const XNode* pNode );
 
 	void SetFromGameState();
diff --git a/stepmania/src/DifficultyMeter.h b/stepmania/src/DifficultyMeter.h
index 89e82af58f..57fbdb5b75 100644
--- a/stepmania/src/DifficultyMeter.h
+++ b/stepmania/src/DifficultyMeter.h
@@ -23,7 +23,7 @@ public:
 	void Load( const RString &sType );
 
 	void LoadFromNode( const XNode* pNode );
-	virtual Actor *Copy() const;
+	virtual DifficultyMeter *Copy() const;
 
 	void SetFromGameState( PlayerNumber pn );
 	void SetFromMeterAndDifficulty( int iMeter, Difficulty dc );
diff --git a/stepmania/src/DynamicActorScroller.cpp b/stepmania/src/DynamicActorScroller.cpp
index 45324b87e3..0b1e24504e 100644
--- a/stepmania/src/DynamicActorScroller.cpp
+++ b/stepmania/src/DynamicActorScroller.cpp
@@ -6,7 +6,7 @@
 #include "RageUtil.h"
 #include "LuaBinding.h"
 
-Actor *DynamicActorScroller::Copy() const { return new DynamicActorScroller(*this); }
+DynamicActorScroller *DynamicActorScroller::Copy() const { return new DynamicActorScroller(*this); }
 
 void DynamicActorScroller::LoadFromNode( const XNode *pNode )
 {
diff --git a/stepmania/src/DynamicActorScroller.h b/stepmania/src/DynamicActorScroller.h
index 6d0f092314..63463a21ec 100644
--- a/stepmania/src/DynamicActorScroller.h
+++ b/stepmania/src/DynamicActorScroller.h
@@ -9,7 +9,7 @@
 class DynamicActorScroller: public ActorScroller
 {
 public:
-	virtual Actor *Copy() const;
+	virtual DynamicActorScroller *Copy() const;
 	void LoadFromNode( const XNode *pNode );
 
 protected:
@@ -24,7 +24,7 @@ class DynamicActorScrollerAutoDeleteChildren: public DynamicActorScroller
 public:
 	DynamicActorScrollerAutoDeleteChildren() { DeleteChildrenWhenDone(true); }
 	virtual bool AutoLoadChildren() const { return true; }
-	virtual Actor *Copy() const;
+	virtual DynamicActorScrollerAutoDeleteChildren *Copy() const;
 };
 
 #endif
diff --git a/stepmania/src/FadingBanner.h b/stepmania/src/FadingBanner.h
index 5d308e332b..fe2086be8d 100644
--- a/stepmania/src/FadingBanner.h
+++ b/stepmania/src/FadingBanner.h
@@ -11,7 +11,7 @@ class FadingBanner : public ActorFrame
 {
 public:
 	FadingBanner();
-	virtual Actor *Copy() const;
+	virtual FadingBanner *Copy() const;
 
 	void ScaleToClipped( float fWidth, float fHeight );
 
diff --git a/stepmania/src/GraphDisplay.cpp b/stepmania/src/GraphDisplay.cpp
index 743ad44380..226f9d241d 100644
--- a/stepmania/src/GraphDisplay.cpp
+++ b/stepmania/src/GraphDisplay.cpp
@@ -102,7 +102,7 @@ public:
 
 	}
 
-	virtual Actor *Copy() const;
+	virtual GraphLine *Copy() const;
 
 private:
 	vector<RageSpriteVertex> m_Quads;
@@ -136,7 +136,7 @@ public:
 		DISPLAY->DrawQuadStrip( m_Slices, ARRAYLEN(m_Slices) );
 	}
 
-	virtual Actor *Copy() const;
+	virtual GraphBody *Copy() const;
 
 	RageSpriteVertex m_Slices[2*VALUE_RESOLUTION];
 };
diff --git a/stepmania/src/GraphDisplay.h b/stepmania/src/GraphDisplay.h
index 1eff8f4693..c2b46b32e8 100644
--- a/stepmania/src/GraphDisplay.h
+++ b/stepmania/src/GraphDisplay.h
@@ -13,7 +13,7 @@ class GraphDisplay: public ActorFrame
 public:
 	GraphDisplay();
 	~GraphDisplay();
-	virtual Actor *Copy() const;
+	virtual GraphDisplay *Copy() const;
 	virtual void LoadFromNode( const XNode* pNode );
 
 	void LoadFromStageStats( const StageStats &ss, const PlayerStageStats &s );
diff --git a/stepmania/src/GrooveRadar.h b/stepmania/src/GrooveRadar.h
index e1a5bbc0c7..37d324519c 100644
--- a/stepmania/src/GrooveRadar.h
+++ b/stepmania/src/GrooveRadar.h
@@ -14,7 +14,7 @@ class GrooveRadar : public ActorFrame
 {
 public:
 	GrooveRadar();
-	virtual Actor *Copy() const;
+	virtual GrooveRadar *Copy() const;
 	virtual void LoadFromNode( const XNode* pNode );
 
 	void SetEmpty( PlayerNumber pn );
diff --git a/stepmania/src/HelpDisplay.h b/stepmania/src/HelpDisplay.h
index 611d61402d..d600626723 100644
--- a/stepmania/src/HelpDisplay.h
+++ b/stepmania/src/HelpDisplay.h
@@ -13,7 +13,7 @@ public:
 	HelpDisplay();
 	void Load( const RString &sType );
 
-	virtual Actor *Copy() const;
+	virtual HelpDisplay *Copy() const;
 
 	void SetTips( const vector<RString> &arrayTips ) { SetTips( arrayTips, arrayTips ); }
 	void SetTips( const vector<RString> &arrayTips, const vector<RString> &arrayTipsAlt );
diff --git a/stepmania/src/HoldJudgment.h b/stepmania/src/HoldJudgment.h
index 234f48bfe2..220bb0db00 100644
--- a/stepmania/src/HoldJudgment.h
+++ b/stepmania/src/HoldJudgment.h
@@ -10,7 +10,7 @@ class HoldJudgment : public ActorFrame
 {
 public:
 	HoldJudgment();
-	virtual Actor *Copy() const;
+	virtual HoldJudgment *Copy() const;
 	void Load( const RString &sPath );
 	void LoadFromNode( const XNode* pNode );
 
diff --git a/stepmania/src/Judgment.h b/stepmania/src/Judgment.h
index 668a025527..ab51522a67 100644
--- a/stepmania/src/Judgment.h
+++ b/stepmania/src/Judgment.h
@@ -12,7 +12,7 @@ class Judgment : public ActorFrame
 {
 public:
 	Judgment();
-	virtual Actor *Copy() const;
+	virtual Judgment *Copy() const;
 	void LoadNormal();
 	void LoadNormal( const RString &sPath );
 	void LoadFromMultiPlayer( MultiPlayer mp );
diff --git a/stepmania/src/MemoryCardDisplay.h b/stepmania/src/MemoryCardDisplay.h
index a6b0c43366..1337b736ba 100644
--- a/stepmania/src/MemoryCardDisplay.h
+++ b/stepmania/src/MemoryCardDisplay.h
@@ -13,7 +13,7 @@ public:
 	MemoryCardDisplay();
 	void Load( PlayerNumber pn );
 	void LoadFromNode( const XNode* pNode );
-	virtual Actor *Copy() const;
+	virtual MemoryCardDisplay *Copy() const;
 	void Update( float fDelta );
 
 protected:
diff --git a/stepmania/src/MeterDisplay.h b/stepmania/src/MeterDisplay.h
index 0735d3f096..aa35e19e87 100644
--- a/stepmania/src/MeterDisplay.h
+++ b/stepmania/src/MeterDisplay.h
@@ -11,7 +11,7 @@ public:
 	MeterDisplay();
 	void Load( RString sStreamPath, float fStreamWidth, RString sTipPath );
 	virtual void LoadFromNode( const XNode* pNode );
-	virtual Actor *Copy() const;
+	virtual MeterDisplay *Copy() const;
 
 	void SetPercent( float fPercent );
 
@@ -26,7 +26,7 @@ class SongMeterDisplay: public MeterDisplay
 {
 public:
 	virtual void Update( float fDeltaTime );
-	virtual Actor *Copy() const;
+	virtual SongMeterDisplay *Copy() const;
 };
 
 #endif
diff --git a/stepmania/src/Model.h b/stepmania/src/Model.h
index f90b9c23ec..3c029a69b1 100644
--- a/stepmania/src/Model.h
+++ b/stepmania/src/Model.h
@@ -17,7 +17,7 @@ class Model : public Actor
 public:
 	Model();
 	virtual ~Model();
-	virtual Actor *Copy() const;
+	virtual Model *Copy() const;
 
 	void	Clear();
 	void	Load( const RString &sFile );
diff --git a/stepmania/src/MusicSortDisplay.h b/stepmania/src/MusicSortDisplay.h
index 74b0d57a4e..864b35ebbe 100644
--- a/stepmania/src/MusicSortDisplay.h
+++ b/stepmania/src/MusicSortDisplay.h
@@ -10,7 +10,7 @@ class MusicSortDisplay : public Sprite
 {
 public:
 	MusicSortDisplay();
-	virtual Actor *Copy() const;
+	virtual MusicSortDisplay *Copy() const;
 	void Set( SortOrder so );
 	virtual void HandleMessage( const RString& sMessage );
 
diff --git a/stepmania/src/MusicWheelItem.h b/stepmania/src/MusicWheelItem.h
index f06925ccae..0dd72d5a96 100644
--- a/stepmania/src/MusicWheelItem.h
+++ b/stepmania/src/MusicWheelItem.h
@@ -23,7 +23,7 @@ public:
 	MusicWheelItem(RString sType = "MusicWheelItem");
 	MusicWheelItem( const MusicWheelItem &cpy );
 	virtual ~MusicWheelItem();
-	virtual Actor *Copy() const { return new MusicWheelItem(*this); }
+	virtual MusicWheelItem *Copy() const { return new MusicWheelItem(*this); }
 
 	virtual void LoadFromWheelItemData( const WheelItemBaseData* pWID );
 	virtual void HandleMessage( const RString& sMessage );
diff --git a/stepmania/src/OptionIconRow.h b/stepmania/src/OptionIconRow.h
index 32bb838515..d789c2c38e 100644
--- a/stepmania/src/OptionIconRow.h
+++ b/stepmania/src/OptionIconRow.h
@@ -19,7 +19,7 @@ public:
 
 	void Load();
 	virtual void LoadFromNode( const XNode* pNode );
-	virtual Actor *Copy() const;
+	virtual OptionIconRow *Copy() const;
 	void SetFromGameState( PlayerNumber pn );
 
 	//
diff --git a/stepmania/src/PaneDisplay.h b/stepmania/src/PaneDisplay.h
index 948ca2dd54..97f93f127e 100644
--- a/stepmania/src/PaneDisplay.h
+++ b/stepmania/src/PaneDisplay.h
@@ -51,7 +51,7 @@ class PaneDisplay: public ActorFrame
 {
 public:
 	PaneDisplay();
-	virtual Actor *Copy() const;
+	virtual PaneDisplay *Copy() const;
 
 	void Load( const RString &sMetricsGroup, PlayerNumber pn );
 	void SetFromGameState();
diff --git a/stepmania/src/PercentageDisplay.h b/stepmania/src/PercentageDisplay.h
index ddc3cd218b..e45aa9d55d 100644
--- a/stepmania/src/PercentageDisplay.h
+++ b/stepmania/src/PercentageDisplay.h
@@ -19,7 +19,7 @@ public:
 	void Load( const PlayerState *pPlayerState, const PlayerStageStats *pPlayerStageStats, const RString &sMetricsGroup, bool bAutoRefresh );
 	void Update( float fDeltaTime );
 	virtual void LoadFromNode( const XNode* pNode );
-	virtual Actor *Copy() const;
+	virtual PercentageDisplay *Copy() const;
 
 	static RString FormatPercentScore( float fPercentDancePoints );
 
diff --git a/stepmania/src/Quad.h b/stepmania/src/Quad.h
index ea74653721..4886779281 100644
--- a/stepmania/src/Quad.h
+++ b/stepmania/src/Quad.h
@@ -15,7 +15,7 @@ public:
 	}	
 
 	void LoadFromNode( const XNode* pNode );
-	virtual Actor *Copy() const;
+	virtual Quad *Copy() const;
 };
 
 #endif
diff --git a/stepmania/src/RollingNumbers.h b/stepmania/src/RollingNumbers.h
index 9a02c23624..e73f7ed871 100644
--- a/stepmania/src/RollingNumbers.h
+++ b/stepmania/src/RollingNumbers.h
@@ -11,7 +11,7 @@ public:
 	RollingNumbers();
 
 	void LoadFromNode( const XNode* pNode );
-	virtual Actor *Copy() const;
+	virtual RollingNumbers *Copy() const;
 
 	virtual void Update( float fDeltaTime );
 
diff --git a/stepmania/src/RoomWheel.h b/stepmania/src/RoomWheel.h
index 0b52c7f8a3..0e9026e58e 100644
--- a/stepmania/src/RoomWheel.h
+++ b/stepmania/src/RoomWheel.h
@@ -26,7 +26,7 @@ public:
 
 	void Load( RString sType );
 	virtual void LoadFromWheelItemData( const WheelItemBaseData* pWID );
-	virtual Actor *Copy() const { return new RoomWheelItem(*this); }
+	virtual RoomWheelItem *Copy() const { return new RoomWheelItem(*this); }
 
 private:
 	BitmapText m_Desc;
diff --git a/stepmania/src/ScoreDisplayAliveTime.h b/stepmania/src/ScoreDisplayAliveTime.h
index 99a9a3b337..15cc72d98f 100644
--- a/stepmania/src/ScoreDisplayAliveTime.h
+++ b/stepmania/src/ScoreDisplayAliveTime.h
@@ -17,7 +17,7 @@ public:
 	virtual void Update( float fDelta );
 
 	void LoadFromNode( const XNode* pNode );
-	virtual Actor *Copy() const;
+	virtual ScoreDisplayAliveTime *Copy() const;
 
 	void PlayCommand( const RString &sCommandName );
 
diff --git a/stepmania/src/ScoreDisplayCalories.h b/stepmania/src/ScoreDisplayCalories.h
index 6b852b1338..438b27698e 100644
--- a/stepmania/src/ScoreDisplayCalories.h
+++ b/stepmania/src/ScoreDisplayCalories.h
@@ -16,7 +16,7 @@ public:
 	virtual void Update( float fDelta );
 
 	void LoadFromNode( const XNode* pNode );
-	virtual Actor *Copy() const;
+	virtual ScoreDisplayCalories *Copy() const;
 
 	void PlayCommand( const RString &sCommandName );
 
diff --git a/stepmania/src/ScreenTestInput.cpp b/stepmania/src/ScreenTestInput.cpp
index 7506658cf5..b434d3ea9b 100644
--- a/stepmania/src/ScreenTestInput.cpp
+++ b/stepmania/src/ScreenTestInput.cpp
@@ -27,7 +27,7 @@ public:
 		BitmapText::Update( fDeltaTime );
 	}
 
-	virtual Actor *Copy() const;
+	virtual DeviceList *Copy() const;
 };
 
 REGISTER_ACTOR_CLASS( DeviceList );
@@ -37,7 +37,7 @@ static LocalizedString SECONDARY	( "ScreenTestInput", "secondary" );
 static LocalizedString NOT_MAPPED	( "ScreenTestInput", "not mapped" );
 class InputList: public BitmapText
 {
-	virtual Actor *Copy() const;
+	virtual InputList *Copy() const;
 
 	void Update( float fDeltaTime )
 	{
diff --git a/stepmania/src/Sprite.h b/stepmania/src/Sprite.h
index 836b3d93b7..d690615458 100644
--- a/stepmania/src/Sprite.h
+++ b/stepmania/src/Sprite.h
@@ -16,7 +16,7 @@ public:
 	virtual ~Sprite();
 
 	void LoadFromNode( const XNode* pNode );
-	virtual Actor *Copy() const;
+	virtual Sprite *Copy() const;
 
 	virtual bool EarlyAbortDraw() const;
 	virtual void DrawPrimitives();
diff --git a/stepmania/src/WheelItemBase.h b/stepmania/src/WheelItemBase.h
index a96ab1f174..7f53da6950 100644
--- a/stepmania/src/WheelItemBase.h
+++ b/stepmania/src/WheelItemBase.h
@@ -29,7 +29,7 @@ public:
 	WheelItemBase( RString sType = "WheelItemBase" );
 	WheelItemBase( const WheelItemBase &cpy );
 	virtual void DrawPrimitives();
-	virtual Actor *Copy() const { return new WheelItemBase(*this); }
+	virtual WheelItemBase *Copy() const { return new WheelItemBase(*this); }
 	
 	void Load( RString sType );
 	void DrawGrayBar( Actor& bar );
diff --git a/stepmania/src/WorkoutGraph.h b/stepmania/src/WorkoutGraph.h
index 092f9be9ef..2a76618cbe 100644
--- a/stepmania/src/WorkoutGraph.h
+++ b/stepmania/src/WorkoutGraph.h
@@ -12,7 +12,7 @@ class WorkoutGraph : public ActorFrame
 public:
 	WorkoutGraph();
 	~WorkoutGraph();
-	virtual Actor *Copy() const;
+	virtual WorkoutGraph *Copy() const;
 	
 	void Load();
 	void LoadFromNode( const XNode* pNode );