diff --git a/briar-android/AndroidManifest.xml b/briar-android/AndroidManifest.xml
index d6826c5bb..779e9bdd7 100644
--- a/briar-android/AndroidManifest.xml
+++ b/briar-android/AndroidManifest.xml
@@ -46,36 +46,36 @@
 		    android:label="@string/contact_list_title" >
 		</activity>
 		<activity
-			android:name=".android.groups.ConfigureGroupActivity"
+			android:name="net.sf.briar.android.groups.ConfigureGroupActivity"
 			android:label="@string/app_name" >
 		</activity>
 		<activity
-			android:name=".android.groups.CreateGroupActivity"
-			android:label="@string/create_group_title" >
+			android:name="net.sf.briar.android.groups.CreateGroupActivity"
+			android:label="@string/create_forum_title" >
 		</activity>
 		<activity
-			android:name=".android.groups.GroupActivity"
+			android:name="net.sf.briar.android.groups.GroupActivity"
 			android:label="@string/app_name" >
 		</activity>
 		<activity
-			android:name=".android.groups.GroupListActivity"
-			android:label="@string/groups_title" >
+			android:name="net.sf.briar.android.groups.GroupListActivity"
+			android:label="@string/forums_title" >
 		</activity>
 		<activity
-		    android:name=".android.groups.ManageGroupsActivity"
+		    android:name="net.sf.briar.android.groups.ManageGroupsActivity"
 		    android:label="@string/manage_subscriptions_title" >
 		</activity>
 				<activity
-			android:name=".android.groups.ReadGroupPostActivity"
+			android:name="net.sf.briar.android.groups.ReadGroupPostActivity"
 			android:label="@string/app_name" >
 		</activity>
 		<activity
-			android:name=".android.groups.WriteGroupPostActivity"
+			android:name="net.sf.briar.android.groups.WriteGroupPostActivity"
 			android:label="@string/new_post_title" >
 		</activity>
 		<activity
 			android:name=".android.identity.CreateIdentityActivity"
-			android:label="@string/create_identity_title" >
+			android:label="@string/new_identity_title" >
 		</activity>
 		<activity
 			android:name=".android.invitation.AddContactActivity"
diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index 916e3674c..00d884d35 100644
--- a/briar-android/res/values/strings.xml
+++ b/briar-android/res/values/strings.xml
@@ -13,7 +13,7 @@
 	<string name="expiry_warning">This software has expired.\nPlease install a newer version.</string>
 	<string name="contact_list_button">Contacts</string>
 	<string name="messages_button">Messages</string>
-	<string name="groups_button">Groups</string>
+	<string name="forums_button">Forums</string>
 	<string name="synchronize_button">Synchronize</string>
 	<string name="quit_button">Quit</string>
 	<string name="new_identity_item">New identity\u2026</string>
@@ -58,29 +58,29 @@
 	<string name="to">To:</string>
 	<string name="anonymous">Anonymous</string>
 	<string name="new_contact_item">New contact\u2026</string>
-	<string name="groups_title">Groups</string>
-	<plurals name="groups_available">
-	    <item quantity="one">%1$d group available from contacts</item>
-	    <item quantity="other">%1$d groups available from contacts</item>
+	<string name="forums_title">Forums</string>
+	<plurals name="forums_available">
+	    <item quantity="one">%1$d forum available from contacts</item>
+	    <item quantity="other">%1$d forums available from contacts</item>
 	</plurals>
 	<string name="no_posts">No posts</string>
-	<string name="subscribe_to_this_group">Subscribe to this group</string>
-	<string name="create_group_title">New Group</string>
-	<string name="choose_group_name">Choose a name for your group:</string>
-	<string name="group_visible_to_all">Share this group with all contacts</string>
-	<string name="group_visible_to_some">Share this group with chosen contacts</string>
+	<string name="subscribe_to_this_forum">Subscribe to this forum</string>
+	<string name="create_forum_title">New Forum</string>
+	<string name="choose_forum_name">Choose a name for your forum:</string>
+	<string name="forum_visible_to_all">Share this forum with all contacts</string>
+	<string name="forum_visible_to_some">Share this forum with chosen contacts</string>
 	<string name="new_post_title">New Post</string>
-	<string name="new_group_item">New group\u2026</string>
+	<string name="new_forum_item">New forum\u2026</string>
 	<string name="manage_subscriptions_title">Manage Subscriptions</string>
-	<string name="no_groups_available">No groups available from contacts</string>
+	<string name="no_forums_available">No forums available from contacts</string>
 	<string name="subscribed_all">Subscribed, shared with all contacts</string>
 	<string name="subscribed_some">Subscribed, shared with chosen contacts</string>
 	<string name="not_subscribed">Not subscribed</string>
 	<string name="create_nickname_item">New nickname\u2026</string>
-	<string name="create_identity_title">Create an Identity</string>
+	<string name="new_identity_title">New Identity</string>
 	<string name="create_button">Create</string>
 	<string name="no_contacts">You don\'t have any contacts. Add a contact now?</string>
 	<string name="add_button">Add</string>
 	<string name="cancel_button">Cancel</string>
-	<string name="no_groups">You aren\'t subscribed to any groups. Create a group now?</string>
+	<string name="no_forums">You aren\'t subscribed to any forums. Create a forum now?</string>
 </resources>
diff --git a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
index 175511fc2..1dcb0b931 100644
--- a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
+++ b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
@@ -329,19 +329,19 @@ public class HomeScreenActivity extends RoboActivity {
 		});
 		buttons.add(messagesButton);
 
-		Button groupsButton = new Button(this);
-		groupsButton.setLayoutParams(matchMatch);
-		groupsButton.setBackgroundResource(0);
-		groupsButton.setCompoundDrawablesWithIntrinsicBounds(0,
+		Button forumsButton = new Button(this);
+		forumsButton.setLayoutParams(matchMatch);
+		forumsButton.setBackgroundResource(0);
+		forumsButton.setCompoundDrawablesWithIntrinsicBounds(0,
 				R.drawable.social_chat, 0, 0);
-		groupsButton.setText(R.string.groups_button);
-		groupsButton.setOnClickListener(new OnClickListener() {
+		forumsButton.setText(R.string.forums_button);
+		forumsButton.setOnClickListener(new OnClickListener() {
 			public void onClick(View view) {
 				startActivity(new Intent(HomeScreenActivity.this,
 						GroupListActivity.class));
 			}
 		});
-		buttons.add(groupsButton);
+		buttons.add(forumsButton);
 
 		Button syncButton = new Button(this);
 		syncButton.setLayoutParams(matchMatch);
diff --git a/briar-android/src/net/sf/briar/android/groups/ConfigureGroupActivity.java b/briar-android/src/net/sf/briar/android/groups/ConfigureGroupActivity.java
index 139f93e80..61798d475 100644
--- a/briar-android/src/net/sf/briar/android/groups/ConfigureGroupActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/ConfigureGroupActivity.java
@@ -87,7 +87,7 @@ SelectContactsDialog.Listener {
 
 		subscribeCheckBox = new CheckBox(this);
 		subscribeCheckBox.setId(1);
-		subscribeCheckBox.setText(R.string.subscribe_to_this_group);
+		subscribeCheckBox.setText(R.string.subscribe_to_this_forum);
 		subscribeCheckBox.setChecked(subscribed);
 		subscribeCheckBox.setOnClickListener(this);
 		layout.addView(subscribeCheckBox);
@@ -97,14 +97,14 @@ SelectContactsDialog.Listener {
 
 		visibleToAll = new RadioButton(this);
 		visibleToAll.setId(2);
-		visibleToAll.setText(R.string.group_visible_to_all);
+		visibleToAll.setText(R.string.forum_visible_to_all);
 		visibleToAll.setEnabled(subscribed);
 		visibleToAll.setOnClickListener(this);
 		radioGroup.addView(visibleToAll);
 
 		visibleToSome = new RadioButton(this);
 		visibleToSome.setId(3);
-		visibleToSome.setText(R.string.group_visible_to_some);
+		visibleToSome.setText(R.string.forum_visible_to_some);
 		visibleToSome.setEnabled(subscribed);
 		visibleToSome.setOnClickListener(this);
 		radioGroup.addView(visibleToSome);
diff --git a/briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java b/briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java
index 6150c8d12..3eb123ad4 100644
--- a/briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java
@@ -85,7 +85,7 @@ SelectContactsDialog.Listener {
 		chooseName.setGravity(CENTER);
 		chooseName.setTextSize(18);
 		chooseName.setPadding(10, 10, 10, 0);
-		chooseName.setText(R.string.choose_group_name);
+		chooseName.setText(R.string.choose_forum_name);
 		layout.addView(chooseName);
 
 		nameEntry = new EditText(this) {
@@ -106,13 +106,13 @@ SelectContactsDialog.Listener {
 
 		visibleToAll = new RadioButton(this);
 		visibleToAll.setId(2);
-		visibleToAll.setText(R.string.group_visible_to_all);
+		visibleToAll.setText(R.string.forum_visible_to_all);
 		visibleToAll.setOnClickListener(this);
 		radioGroup.addView(visibleToAll);
 
 		visibleToSome = new RadioButton(this);
 		visibleToSome.setId(3);
-		visibleToSome.setText(R.string.group_visible_to_some);
+		visibleToSome.setText(R.string.forum_visible_to_some);
 		visibleToSome.setOnClickListener(this);
 		radioGroup.addView(visibleToSome);
 		layout.addView(radioGroup);
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java b/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java
index d1c1a542d..3bee3146a 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java
@@ -68,7 +68,7 @@ class GroupListAdapter extends BaseAdapter {
 			manage.setGravity(CENTER);
 			manage.setTextSize(18);
 			manage.setPadding(10, 10, 10, 10);
-			String format = res.getQuantityString(R.plurals.groups_available,
+			String format = res.getQuantityString(R.plurals.forums_available,
 					available);
 			manage.setText(String.format(format, available));
 			return manage;
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupSpinnerAdapter.java b/briar-android/src/net/sf/briar/android/groups/GroupSpinnerAdapter.java
index ff027ac97..73cbbd715 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupSpinnerAdapter.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupSpinnerAdapter.java
@@ -60,7 +60,7 @@ class GroupSpinnerAdapter extends BaseAdapter implements SpinnerAdapter {
 		int pad = res.getInteger(R.integer.spinner_padding);
 		name.setPadding(pad, pad, pad, pad);
 		GroupItem item = getItem(position);
-		if(item == NEW) name.setText(R.string.new_group_item);
+		if(item == NEW) name.setText(R.string.new_forum_item);
 		else name.setText(item.getGroup().getName());
 		return name;
 	}
diff --git a/briar-android/src/net/sf/briar/android/groups/ManageGroupsAdapter.java b/briar-android/src/net/sf/briar/android/groups/ManageGroupsAdapter.java
index 77565ef61..91c73bbbe 100644
--- a/briar-android/src/net/sf/briar/android/groups/ManageGroupsAdapter.java
+++ b/briar-android/src/net/sf/briar/android/groups/ManageGroupsAdapter.java
@@ -59,7 +59,7 @@ class ManageGroupsAdapter extends BaseAdapter {
 			none.setGravity(CENTER);
 			none.setTextSize(18);
 			none.setPadding(10, 10, 10, 10);
-			none.setText(R.string.no_groups_available);
+			none.setText(R.string.no_forums_available);
 			return none;
 		}
 
diff --git a/briar-android/src/net/sf/briar/android/groups/NoGroupsDialog.java b/briar-android/src/net/sf/briar/android/groups/NoGroupsDialog.java
index 1c44a7512..4b51bd38c 100644
--- a/briar-android/src/net/sf/briar/android/groups/NoGroupsDialog.java
+++ b/briar-android/src/net/sf/briar/android/groups/NoGroupsDialog.java
@@ -18,7 +18,7 @@ public class NoGroupsDialog extends DialogFragment {
 	@Override
 	public Dialog onCreateDialog(Bundle state) {
 		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-		builder.setMessage(R.string.no_groups);
+		builder.setMessage(R.string.no_forums);
 		builder.setPositiveButton(R.string.create_button,
 				new DialogInterface.OnClickListener() {
 			public void onClick(DialogInterface dialog, int id) {