diff --git a/OpenPGP-Keychain-API-Demo/AndroidManifest.xml b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml
index 074e6caa7..d95df65a3 100644
--- a/OpenPGP-Keychain-API-Demo/AndroidManifest.xml
+++ b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml
@@ -22,7 +22,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".OpenPGPProviderActivity"
+            android:name=".OpenPgpProviderActivity"
             android:label="OpenPGP Provider"
             android:windowSoftInputMode="stateHidden" />
         <activity
diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java
index 84e65c6d8..e4fd8cd99 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java
@@ -67,7 +67,7 @@ public class BaseActivity extends PreferenceActivity {
         mCryptoProvider.setOnPreferenceClickListener(new OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {
-                startActivity(new Intent(mActivity, OpenPGPProviderActivity.class));
+                startActivity(new Intent(mActivity, OpenPgpProviderActivity.class));
 
                 return false;
             }
diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/OpenPGPProviderActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java
similarity index 98%
rename from OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/OpenPGPProviderActivity.java
rename to OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java
index b0181eab2..0780eed5a 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/OpenPGPProviderActivity.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java
@@ -42,7 +42,7 @@ import android.widget.ListAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 
-public class OpenPGPProviderActivity extends Activity {
+public class OpenPgpProviderActivity extends Activity {
     Activity mActivity;
 
     EditText mMessage;
@@ -104,7 +104,7 @@ public class OpenPGPProviderActivity extends Activity {
                 public void run() {
                     mMessage.setText(new String(outputBytes));
                     if (signatureResult != null) {
-                        Toast.makeText(OpenPGPProviderActivity.this,
+                        Toast.makeText(OpenPgpProviderActivity.this,
                                 "signature result:\n" + signatureResult.toString(),
                                 Toast.LENGTH_LONG).show();
                     }
@@ -254,7 +254,7 @@ public class OpenPGPProviderActivity extends Activity {
 
                         // bind to service
                         mCryptoServiceConnection = new OpenPgpServiceConnection(
-                                OpenPGPProviderActivity.this, packageName);
+                                OpenPgpProviderActivity.this, packageName);
                         mCryptoServiceConnection.bindToService();
 
                         dialog.dismiss();