diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f66bdf555..ff6042db9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -8,16 +8,16 @@
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <application android:label="@string/app_name" >
         <activity
-            android:name=".Briar"
+            android:name=".HelloWorldActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <service android:name=".BriarService" android:exported="false" >
+        <service android:name=".HelloWorldService" android:exported="false" >
             <intent-filter>
-                <action android:name="net.sf.briar.BriarService" />
+                <action android:name="net.sf.briar.HelloWorldService" />
             </intent-filter>
         </service>
     </application>
diff --git a/src/net/sf/briar/HelloWorldActivity.java b/src/net/sf/briar/HelloWorldActivity.java
index 17312662d..53607532d 100644
--- a/src/net/sf/briar/HelloWorldActivity.java
+++ b/src/net/sf/briar/HelloWorldActivity.java
@@ -13,7 +13,7 @@ public class HelloWorldActivity extends Activity {
 		TextView text = new TextView(this);
 		text.setText("Hello world");
 		setContentView(text);
-		Intent intent = new Intent("net.sf.briar.AfsnitService");
+		Intent intent = new Intent("net.sf.briar.HelloWorldService");
 		startService(intent);
 	}
 }