diff --git a/OpenPGP-Keychain/src/main/AndroidManifest.xml b/OpenPGP-Keychain/src/main/AndroidManifest.xml
index b8ee23514..d40580a79 100644
--- a/OpenPGP-Keychain/src/main/AndroidManifest.xml
+++ b/OpenPGP-Keychain/src/main/AndroidManifest.xml
@@ -243,7 +243,7 @@
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_key_server_query" />
         <activity
-            android:name=".ui.KeyServerUploadActivity"
+            android:name=".ui.UploadKeyActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_send_key" />
         <activity
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
similarity index 96%
rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
index 7b410e461..d72dd37ab 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
@@ -44,7 +44,7 @@ import com.beardedhen.androidbootstrap.BootstrapButton;
  * 
  * Sends the selected public key to a key server
  */
-public class KeyServerUploadActivity extends SherlockFragmentActivity {
+public class UploadKeyActivity extends SherlockFragmentActivity {
     private BootstrapButton mUploadButton;
     private Spinner mKeyServerSpinner;
 
@@ -111,7 +111,7 @@ public class KeyServerUploadActivity extends SherlockFragmentActivity {
 
                 if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
 
-                    Toast.makeText(KeyServerUploadActivity.this, R.string.key_send_success,
+                    Toast.makeText(UploadKeyActivity.this, R.string.key_send_success,
                             Toast.LENGTH_SHORT).show();
                     finish();
                 }
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index e1cefbed1..74aac1d3c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -384,7 +384,7 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements
     }
 
     private void uploadToKeyserver(Uri dataUri) {
-        Intent uploadIntent = new Intent(this, KeyServerUploadActivity.class);
+        Intent uploadIntent = new Intent(this, UploadKeyActivity.class);
         uploadIntent.setData(dataUri);
         startActivityForResult(uploadIntent, Id.request.export_to_server);
     }