diff --git a/stepmania/NoteSkins/kb7/default/Down Go Receptor.png b/stepmania/NoteSkins/kb7/default/Key Go Receptor.png
similarity index 100%
rename from stepmania/NoteSkins/kb7/default/Down Go Receptor.png
rename to stepmania/NoteSkins/kb7/default/Key Go Receptor.png
diff --git a/stepmania/NoteSkins/kb7/default/Down Hold Body active.png b/stepmania/NoteSkins/kb7/default/Key Hold Body active.png
similarity index 100%
rename from stepmania/NoteSkins/kb7/default/Down Hold Body active.png
rename to stepmania/NoteSkins/kb7/default/Key Hold Body active.png
diff --git a/stepmania/NoteSkins/kb7/default/Down Hold Body inactive.png b/stepmania/NoteSkins/kb7/default/Key Hold Body inactive.png
similarity index 100%
rename from stepmania/NoteSkins/kb7/default/Down Hold Body inactive.png
rename to stepmania/NoteSkins/kb7/default/Key Hold Body inactive.png
diff --git a/stepmania/NoteSkins/kb7/default/Down Hold BottomCap Inactive.png b/stepmania/NoteSkins/kb7/default/Key Hold BottomCap Inactive.png
similarity index 100%
rename from stepmania/NoteSkins/kb7/default/Down Hold BottomCap Inactive.png
rename to stepmania/NoteSkins/kb7/default/Key Hold BottomCap Inactive.png
diff --git a/stepmania/NoteSkins/kb7/default/Down Hold BottomCap active.png b/stepmania/NoteSkins/kb7/default/Key Hold BottomCap active.png
similarity index 100%
rename from stepmania/NoteSkins/kb7/default/Down Hold BottomCap active.png
rename to stepmania/NoteSkins/kb7/default/Key Hold BottomCap active.png
diff --git a/stepmania/NoteSkins/kb7/default/Down Hold Explosion 2x1.png b/stepmania/NoteSkins/kb7/default/Key Hold Explosion 2x1.png
similarity index 100%
rename from stepmania/NoteSkins/kb7/default/Down Hold Explosion 2x1.png
rename to stepmania/NoteSkins/kb7/default/Key Hold Explosion 2x1.png
diff --git a/stepmania/NoteSkins/kb7/default/Down Receptor.lua b/stepmania/NoteSkins/kb7/default/Key Receptor.lua
similarity index 84%
rename from stepmania/NoteSkins/kb7/default/Down Receptor.lua
rename to stepmania/NoteSkins/kb7/default/Key Receptor.lua
index 407013075f..aef9e9a115 100755
--- a/stepmania/NoteSkins/kb7/default/Down Receptor.lua	
+++ b/stepmania/NoteSkins/kb7/default/Key Receptor.lua	
@@ -1,9 +1,9 @@
 local t = Def.ActorFrame {
-	LoadActor( "Down Go Receptor" )..{
+	LoadActor( "Key Go Receptor" )..{
 		InitCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'InitCommand');
 		NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand');
 	};
-	LoadActor( "Down Go Receptor" )..{
+	LoadActor( "Key Go Receptor" )..{
 		InitCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'InitCommand');
 		PressCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'PressCommand');
 		LiftCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'LiftCommand');
diff --git a/stepmania/NoteSkins/kb7/default/Down Roll Body active.png b/stepmania/NoteSkins/kb7/default/Key Roll Body active.png
similarity index 100%
rename from stepmania/NoteSkins/kb7/default/Down Roll Body active.png
rename to stepmania/NoteSkins/kb7/default/Key Roll Body active.png
diff --git a/stepmania/NoteSkins/kb7/default/Down Roll Body inactive.png b/stepmania/NoteSkins/kb7/default/Key Roll Body inactive.png
similarity index 100%
rename from stepmania/NoteSkins/kb7/default/Down Roll Body inactive.png
rename to stepmania/NoteSkins/kb7/default/Key Roll Body inactive.png
diff --git a/stepmania/NoteSkins/kb7/default/Down Roll BottomCap active.png b/stepmania/NoteSkins/kb7/default/Key Roll BottomCap active.png
similarity index 100%
rename from stepmania/NoteSkins/kb7/default/Down Roll BottomCap active.png
rename to stepmania/NoteSkins/kb7/default/Key Roll BottomCap active.png
diff --git a/stepmania/NoteSkins/kb7/default/Down Roll BottomCap inactive.png b/stepmania/NoteSkins/kb7/default/Key Roll BottomCap inactive.png
similarity index 100%
rename from stepmania/NoteSkins/kb7/default/Down Roll BottomCap inactive.png
rename to stepmania/NoteSkins/kb7/default/Key Roll BottomCap inactive.png
diff --git a/stepmania/NoteSkins/kb7/default/Down Tap Explosion Bright.png b/stepmania/NoteSkins/kb7/default/Key Tap Explosion Bright.png
similarity index 100%
rename from stepmania/NoteSkins/kb7/default/Down Tap Explosion Bright.png
rename to stepmania/NoteSkins/kb7/default/Key Tap Explosion Bright.png
diff --git a/stepmania/NoteSkins/kb7/default/Down Tap Explosion Dim.png b/stepmania/NoteSkins/kb7/default/Key Tap Explosion Dim.png
similarity index 100%
rename from stepmania/NoteSkins/kb7/default/Down Tap Explosion Dim.png
rename to stepmania/NoteSkins/kb7/default/Key Tap Explosion Dim.png
diff --git a/stepmania/NoteSkins/kb7/default/Down Tap Note.lua b/stepmania/NoteSkins/kb7/default/Key Tap Note.lua
similarity index 53%
rename from stepmania/NoteSkins/kb7/default/Down Tap Note.lua
rename to stepmania/NoteSkins/kb7/default/Key Tap Note.lua
index 4223420c5e..2adb303974 100755
--- a/stepmania/NoteSkins/kb7/default/Down Tap Note.lua	
+++ b/stepmania/NoteSkins/kb7/default/Key Tap Note.lua	
@@ -1,4 +1,4 @@
-return Def.Sprite {
-	Texture=NOTESKIN:GetPath( '_down', 'tap note' );
-	Frames = Sprite.LinearFrames( 4, 1 );
-};
+return Def.Sprite {
+	Texture=NOTESKIN:GetPath( '_key', 'tap note' );
+	Frames = Sprite.LinearFrames( 4, 1 );
+};
diff --git a/stepmania/NoteSkins/kb7/default/NoteSkin.lua b/stepmania/NoteSkins/kb7/default/NoteSkin.lua
index f0d79395de..1bced82839 100755
--- a/stepmania/NoteSkins/kb7/default/NoteSkin.lua
+++ b/stepmania/NoteSkins/kb7/default/NoteSkin.lua
@@ -2,13 +2,13 @@ local ret = ... or {};
 
 ret.RedirTable =
 {
-	Key1 = "Down",
-	Key2 = "Down",
-	Key3 = "Down",
-	Key4 = "Down",
-	Key5 = "Down",
-	Key6 = "Down",
-	Key7 = "Down",
+	Key1 = "Key",
+	Key2 = "Key",
+	Key3 = "Key",
+	Key4 = "Key",
+	Key5 = "Key",
+	Key6 = "Key",
+	Key7 = "Key",
 };
 
 local OldRedir = ret.Redir;
@@ -69,12 +69,13 @@ ret.PartsToRotate =
 };
 ret.Rotate =
 {
-	Up = 180,
-	Down = 0,
-	Left = 90,
-	Right = -90,
-	UpLeft = 135,
-	UpRight = 225,
+	Key1 = 0,
+	Key2 = 0,
+	Key3 = 0,
+	Key4 = 0,
+	Key5 = 0,
+	Key6 = 0,
+	Key7 = 0,
 };
 
 --
diff --git a/stepmania/NoteSkins/kb7/default/_down tap note 8x8.png b/stepmania/NoteSkins/kb7/default/_key tap note 8x8.png
similarity index 100%
rename from stepmania/NoteSkins/kb7/default/_down tap note 8x8.png
rename to stepmania/NoteSkins/kb7/default/_key tap note 8x8.png