diff --git a/src/axis.cpp b/src/axis.cpp
index c81311e..1a9417b 100644
--- a/src/axis.cpp
+++ b/src/axis.cpp
@@ -156,7 +156,7 @@ void Axis::timerCalled() {
 }
 
 void Axis::write( QTextStream &stream ) {
-    stream << "\t" << getName() << ": ";
+    stream << "\tAxis " << (index+1) << ": ";
     if (gradient) stream << "gradient, ";
     if (throttle > 0) stream << "throttle+, ";
     else if (throttle < 0) stream << "throttle-, ";
diff --git a/src/button.cpp b/src/button.cpp
index 18b5e64..26b2eb9 100644
--- a/src/button.cpp
+++ b/src/button.cpp
@@ -60,7 +60,7 @@ bool Button::read( QTextStream &stream ) {
 }
 
 void Button::write( QTextStream &stream ) {
-    stream << "\t" << getName() << ": ";
+    stream << "\tButton " << (index+1) << ": ";
     if (rapidfire) stream << "rapidfire, ";
     if (sticky) stream << "sticky, ";
     stream << (useMouse ? "mouse " : "key ") << keycode << "\n";