diff --git a/res/layout/media_overview_activity.xml b/res/layout/profile_activity.xml
similarity index 100%
rename from res/layout/media_overview_activity.xml
rename to res/layout/profile_activity.xml
diff --git a/res/layout/media_overview_document_item.xml b/res/layout/profile_document_item.xml
similarity index 94%
rename from res/layout/media_overview_document_item.xml
rename to res/layout/profile_document_item.xml
index 28f6d49d8..38e1c60f7 100644
--- a/res/layout/media_overview_document_item.xml
+++ b/res/layout/profile_document_item.xml
@@ -23,7 +23,7 @@
               android:layout_height="wrap_content"
               android:layout_gravity="center_vertical"
               android:textSize="12sp"
-              android:textColor="?attr/media_overview_document_foreground"
+              android:textColor="?attr/profile_document_foreground"
               android:paddingTop="20dp"
               tools:text="Jun 1"/>
 
diff --git a/res/layout/media_overview_document_item_header.xml b/res/layout/profile_document_item_header.xml
similarity index 81%
rename from res/layout/media_overview_document_item_header.xml
rename to res/layout/profile_document_item_header.xml
index 9aebd7c1f..b0a2b6148 100644
--- a/res/layout/media_overview_document_item_header.xml
+++ b/res/layout/profile_document_item_header.xml
@@ -3,14 +3,14 @@
              xmlns:tools="http://schemas.android.com/tools"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
-             android:background="?attr/media_overview_toolbar_background"
+             android:background="?attr/profile_toolbar_background"
              android:padding="16dp">
 
     <TextView android:id="@+id/text"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_gravity="start|center_vertical"
-              android:textColor="?attr/media_overview_header_foreground"
+              android:textColor="?attr/profile_header_foreground"
               android:textSize="14sp"
               android:textStyle="bold"
               tools:text="March 1, 2015" />
diff --git a/res/layout/media_overview_documents_fragment.xml b/res/layout/profile_documents_fragment.xml
similarity index 91%
rename from res/layout/media_overview_documents_fragment.xml
rename to res/layout/profile_documents_fragment.xml
index fe944086e..05dca086b 100644
--- a/res/layout/media_overview_documents_fragment.xml
+++ b/res/layout/profile_documents_fragment.xml
@@ -3,7 +3,7 @@
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="?attr/media_overview_toolbar_background">
+                android:background="?attr/profile_toolbar_background">
 
     <android.support.v7.widget.RecyclerView
             android:id="@+id/recycler_view"
diff --git a/res/layout/media_overview_gallery_fragment.xml b/res/layout/profile_gallery_fragment.xml
similarity index 91%
rename from res/layout/media_overview_gallery_fragment.xml
rename to res/layout/profile_gallery_fragment.xml
index 883d328fb..09c981890 100644
--- a/res/layout/media_overview_gallery_fragment.xml
+++ b/res/layout/profile_gallery_fragment.xml
@@ -3,7 +3,7 @@
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="?attr/media_overview_toolbar_background">
+                android:background="?attr/profile_toolbar_background">
 
     <android.support.v7.widget.RecyclerView
             android:id="@+id/media_grid"
diff --git a/res/layout/media_overview_gallery_item.xml b/res/layout/profile_gallery_item.xml
similarity index 100%
rename from res/layout/media_overview_gallery_item.xml
rename to res/layout/profile_gallery_item.xml
diff --git a/res/layout/media_overview_gallery_item_header.xml b/res/layout/profile_gallery_item_header.xml
similarity index 81%
rename from res/layout/media_overview_gallery_item_header.xml
rename to res/layout/profile_gallery_item_header.xml
index 9aebd7c1f..b0a2b6148 100644
--- a/res/layout/media_overview_gallery_item_header.xml
+++ b/res/layout/profile_gallery_item_header.xml
@@ -3,14 +3,14 @@
              xmlns:tools="http://schemas.android.com/tools"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
-             android:background="?attr/media_overview_toolbar_background"
+             android:background="?attr/profile_toolbar_background"
              android:padding="16dp">
 
     <TextView android:id="@+id/text"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_gravity="start|center_vertical"
-              android:textColor="?attr/media_overview_header_foreground"
+              android:textColor="?attr/profile_header_foreground"
               android:textSize="14sp"
               android:textStyle="bold"
               tools:text="March 1, 2015" />
diff --git a/res/menu/media_overview_context.xml b/res/menu/profile_context.xml
similarity index 100%
rename from res/menu/media_overview_context.xml
rename to res/menu/profile_context.xml
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 867a1a137..eaea83bcf 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -136,11 +136,10 @@
 
     <attr name="verification_background" format="color"/>
 
-    <attr name="media_overview_toolbar_background" format="color"/>
-    <attr name="media_overview_toolbar_foreground" format="color"/>
-    <attr name="media_overview_header_foreground" format="color"/>
-    <attr name="media_overview_document_background" format="color"/>
-    <attr name="media_overview_document_foreground" format="color"/>
+    <attr name="profile_toolbar_background" format="color"/>
+    <attr name="profile_toolbar_foreground" format="color"/>
+    <attr name="profile_header_foreground" format="color"/>
+    <attr name="profile_document_foreground" format="color"/>
 
     <attr name="shared_contact_details_header_background" format="color"/>
     <attr name="shared_contact_details_titlebar" format="color"/>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index e43a98519..141938bf0 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -44,7 +44,7 @@
     <dimen name="quote_corner_radius_bottom">4dp</dimen>
     <dimen name="quote_corner_radius_preview">18dp</dimen>
 
-    <integer name="media_overview_cols">3</integer>
+    <integer name="profile_cols">3</integer>
 
     <dimen name="quick_camera_shutter_ring_size">52dp</dimen>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 5cd86a882..ef0871cf8 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -17,11 +17,10 @@
         <item name="contact_selection_lay_user">#a0000000</item>
         <item name="contact_selection_header_text">@color/delta_primary_dark</item>
 
-        <item name="media_overview_toolbar_background">@color/white</item>
-        <item name="media_overview_toolbar_foreground">@color/gray70</item>
-        <item name="media_overview_header_foreground">@color/gray50</item>
-        <item name="media_overview_document_foreground">@color/gray70</item>
-        <item name="media_overview_document_background">@color/white</item>
+        <item name="profile_toolbar_background">@color/white</item>
+        <item name="profile_toolbar_foreground">@color/gray70</item>
+        <item name="profile_header_foreground">@color/gray50</item>
+        <item name="profile_document_foreground">@color/gray70</item>
     </style>
 
     <style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.DarkTheme">
@@ -39,11 +38,10 @@
         <item name="contact_selection_lay_user">#afeeeeee</item>
         <item name="contact_selection_header_text">#66eeeeee</item>
 
-        <item name="media_overview_toolbar_background">@color/black</item>
-        <item name="media_overview_toolbar_foreground">@color/white</item>
-        <item name="media_overview_header_foreground">@color/gray10</item>
-        <item name="media_overview_document_foreground">@color/white</item>
-        <item name="media_overview_document_background">@color/black</item>
+        <item name="profile_toolbar_background">@color/black</item>
+        <item name="profile_toolbar_foreground">@color/white</item>
+        <item name="profile_header_foreground">@color/gray10</item>
+        <item name="profile_document_foreground">@color/white</item>
     </style>
 
     <style name="TextSecure.HighlightTheme" parent="@style/TextSecure.LightTheme">
diff --git a/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java b/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java
index d20ca40c5..11ee0ef40 100644
--- a/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java
+++ b/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java
@@ -43,7 +43,7 @@ public class MediaDocumentsAdapter extends CursorRecyclerViewAdapter<ViewHolder>
 
   @Override
   public ViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
-    return new ViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.media_overview_document_item, parent, false));
+    return new ViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.profile_document_item, parent, false));
   }
 
   @Override
@@ -84,7 +84,7 @@ public class MediaDocumentsAdapter extends CursorRecyclerViewAdapter<ViewHolder>
 
   @Override
   public HeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent) {
-    return new HeaderViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.media_overview_document_item_header, parent, false));
+    return new HeaderViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.profile_document_item_header, parent, false));
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java b/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java
index 3df3b4085..7de48ec7b 100644
--- a/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java
+++ b/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java
@@ -90,12 +90,12 @@ class MediaGalleryAdapter extends StickyHeaderGridAdapter {
 
   @Override
   public StickyHeaderGridAdapter.HeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent, int headerType) {
-    return new HeaderHolder(LayoutInflater.from(context).inflate(R.layout.media_overview_gallery_item_header, parent, false));
+    return new HeaderHolder(LayoutInflater.from(context).inflate(R.layout.profile_gallery_item_header, parent, false));
   }
 
   @Override
   public ItemViewHolder onCreateItemViewHolder(ViewGroup parent, int itemType) {
-    return new ViewHolder(LayoutInflater.from(context).inflate(R.layout.media_overview_gallery_item, parent, false));
+    return new ViewHolder(LayoutInflater.from(context).inflate(R.layout.profile_gallery_item, parent, false));
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/ProfileActivity.java b/src/org/thoughtcrime/securesms/ProfileActivity.java
index 3e1361d87..900e10606 100644
--- a/src/org/thoughtcrime/securesms/ProfileActivity.java
+++ b/src/org/thoughtcrime/securesms/ProfileActivity.java
@@ -97,7 +97,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity  {
 
   @Override
   protected void onCreate(Bundle bundle, boolean ready) {
-    setContentView(R.layout.media_overview_activity);
+    setContentView(R.layout.profile_activity);
 
     initializeResources();
     initializeToolbar();
@@ -312,11 +312,11 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity  {
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-      View view = inflater.inflate(R.layout.media_overview_gallery_fragment, container, false);
+      View view = inflater.inflate(R.layout.profile_gallery_fragment, container, false);
 
       this.recyclerView = ViewUtil.findById(view, R.id.media_grid);
       this.noMedia      = ViewUtil.findById(view, R.id.no_images);
-      this.gridManager  = new StickyHeaderGridLayoutManager(getResources().getInteger(R.integer.media_overview_cols));
+      this.gridManager  = new StickyHeaderGridLayoutManager(getResources().getInteger(R.integer.profile_cols));
 
       this.recyclerView.setAdapter(new MediaGalleryAdapter(getContext(),
                                                            GlideApp.with(this),
@@ -333,7 +333,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity  {
     public void onConfigurationChanged(Configuration newConfig) {
       super.onConfigurationChanged(newConfig);
       if (gridManager != null) {
-        this.gridManager = new StickyHeaderGridLayoutManager(getResources().getInteger(R.integer.media_overview_cols));
+        this.gridManager = new StickyHeaderGridLayoutManager(getResources().getInteger(R.integer.profile_cols));
         this.recyclerView.setLayoutManager(gridManager);
       }
     }
@@ -452,7 +452,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity  {
 
       @Override
       public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-        mode.getMenuInflater().inflate(R.menu.media_overview_context, menu);
+        mode.getMenuInflater().inflate(R.menu.profile_context, menu);
         mode.setTitle("1");
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -498,7 +498,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity  {
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-      View                  view    = inflater.inflate(R.layout.media_overview_documents_fragment, container, false);
+      View                  view    = inflater.inflate(R.layout.profile_documents_fragment, container, false);
       MediaDocumentsAdapter adapter = new MediaDocumentsAdapter(getContext(), null, locale);
 
       this.recyclerView  = ViewUtil.findById(view, R.id.recycler_view);