diff --git a/app/src/main/java/me/impy/aegis/Preferences.java b/app/src/main/java/me/impy/aegis/Preferences.java
index b5ac8e6f..78721828 100644
--- a/app/src/main/java/me/impy/aegis/Preferences.java
+++ b/app/src/main/java/me/impy/aegis/Preferences.java
@@ -19,8 +19,8 @@ public class Preferences {
         return _prefs.getBoolean("pref_secure_screen", true);
     }
 
-    public boolean isIssuerVisible() {
-        return _prefs.getBoolean("pref_issuer", false);
+    public boolean isAccountNameVisible() {
+        return _prefs.getBoolean("pref_account_name", false);
     }
 
     public boolean isIntroDone() {
diff --git a/app/src/main/java/me/impy/aegis/ui/MainActivity.java b/app/src/main/java/me/impy/aegis/ui/MainActivity.java
index 3092e955..e57eb267 100644
--- a/app/src/main/java/me/impy/aegis/ui/MainActivity.java
+++ b/app/src/main/java/me/impy/aegis/ui/MainActivity.java
@@ -62,7 +62,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         // set up the entry view
         _entryListView = (EntryListView) getSupportFragmentManager().findFragmentById(R.id.key_profiles);
         _entryListView.setListener(this);
-        _entryListView.setShowIssuer(getPreferences().isIssuerVisible());
+        _entryListView.setShowAccountName(getPreferences().isAccountNameVisible());
 
         // set up the floating action button
         _fabMenu = findViewById(R.id.fab);
@@ -153,8 +153,8 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         if (data.getBooleanExtra("needsRecreate", false)) {
             recreate();
         } else if (data.getBooleanExtra("needsRefresh", false)) {
-            boolean showIssuer = getPreferences().isIssuerVisible();
-            _entryListView.setShowIssuer(showIssuer);
+            boolean showAccountName = getPreferences().isAccountNameVisible();
+            _entryListView.setShowAccountName(showAccountName);
             _entryListView.refresh(true);
         }
     }
diff --git a/app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java b/app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java
index 550e163f..a5efb4ff 100644
--- a/app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java
+++ b/app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java
@@ -111,7 +111,7 @@ public class PreferencesFragment extends PreferenceFragmentCompat implements Pas
         });
         timeoutPreference.getOnPreferenceChangeListener().onPreferenceChange(timeoutPreference, timeoutPreference.getText());*/
 
-        Preference issuerPreference = findPreference("pref_issuer");
+        Preference issuerPreference = findPreference("pref_account_name");
         issuerPreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
diff --git a/app/src/main/java/me/impy/aegis/ui/views/EntryAdapter.java b/app/src/main/java/me/impy/aegis/ui/views/EntryAdapter.java
index 6268f57b..8549b49c 100644
--- a/app/src/main/java/me/impy/aegis/ui/views/EntryAdapter.java
+++ b/app/src/main/java/me/impy/aegis/ui/views/EntryAdapter.java
@@ -21,7 +21,7 @@ import me.impy.aegis.otp.TotpInfo;
 public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements ItemTouchHelperAdapter {
     private List<DatabaseEntry> _entries;
     private static Listener _listener;
-    private boolean _showIssuer;
+    private boolean _showAccountName;
 
     // keeps track of the viewholders that are currently bound
     private List<EntryHolder> _holders;
@@ -32,8 +32,8 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
         _listener = listener;
     }
 
-    public void setShowIssuer(boolean showIssuer) {
-        _showIssuer = showIssuer;
+    public void setShowAccountName(boolean showAccountName) {
+        _showAccountName = showAccountName;
     }
 
     public void addEntry(DatabaseEntry entry) {
@@ -126,7 +126,7 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
     public void onBindViewHolder(final EntryHolder holder, int position) {
         DatabaseEntry entry = _entries.get(position);
         boolean showProgress = !isPeriodUniform() && entry.getInfo() instanceof TotpInfo;
-        holder.setData(entry, _showIssuer, showProgress);
+        holder.setData(entry, _showAccountName, showProgress);
         if (showProgress) {
             holder.startRefreshLoop();
         }
diff --git a/app/src/main/java/me/impy/aegis/ui/views/EntryHolder.java b/app/src/main/java/me/impy/aegis/ui/views/EntryHolder.java
index 3b088765..1e586524 100644
--- a/app/src/main/java/me/impy/aegis/ui/views/EntryHolder.java
+++ b/app/src/main/java/me/impy/aegis/ui/views/EntryHolder.java
@@ -34,7 +34,7 @@ public class EntryHolder extends RecyclerView.ViewHolder {
 
     public EntryHolder(final View view) {
         super(view);
-        _profileName = view.findViewById(R.id.profile_name);
+        _profileName = view.findViewById(R.id.profile_account_name);
         _profileCode = view.findViewById(R.id.profile_code);
         _profileIssuer = view.findViewById(R.id.profile_issuer);
         _profileDrawable = view.findViewById(R.id.ivTextDrawable);
@@ -58,7 +58,7 @@ public class EntryHolder extends RecyclerView.ViewHolder {
         });
     }
 
-    public void setData(DatabaseEntry entry, boolean showIssuer, boolean showProgress) {
+    public void setData(DatabaseEntry entry, boolean showAccountName, boolean showProgress) {
         _entry = entry;
 
         // only show the progress bar if there is no uniform period and the entry type is TotpInfo
@@ -70,10 +70,10 @@ public class EntryHolder extends RecyclerView.ViewHolder {
         // only show the button if this entry is of type HotpInfo
         _buttonRefresh.setVisibility(entry.getInfo() instanceof HotpInfo ? View.VISIBLE : View.GONE);
 
-        _profileName.setText(entry.getName());
-        _profileIssuer.setText("");
-        if (showIssuer) {
-            _profileIssuer.setText(" - " + entry.getIssuer());
+        _profileIssuer.setText(entry.getIssuer());
+        _profileName.setText("");
+        if (showAccountName) {
+            _profileName.setText(" - " + entry.getName());
         }
 
         if (_entry.hasIcon()) {
diff --git a/app/src/main/java/me/impy/aegis/ui/views/EntryListView.java b/app/src/main/java/me/impy/aegis/ui/views/EntryListView.java
index b0953d9c..1d305949 100644
--- a/app/src/main/java/me/impy/aegis/ui/views/EntryListView.java
+++ b/app/src/main/java/me/impy/aegis/ui/views/EntryListView.java
@@ -129,8 +129,8 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         _listener.onEntryChange(entry);
     }
 
-    public void setShowIssuer(boolean showIssuer) {
-        _adapter.setShowIssuer(showIssuer);
+    public void setShowAccountName(boolean showAccountName) {
+        _adapter.setShowAccountName(showAccountName);
     }
 
     public void addEntry(DatabaseEntry entry) {
diff --git a/app/src/main/res/layout/card_entry.xml b/app/src/main/res/layout/card_entry.xml
index 0330461f..f410a61f 100644
--- a/app/src/main/res/layout/card_entry.xml
+++ b/app/src/main/res/layout/card_entry.xml
@@ -52,8 +52,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/profile_name"
-                android:text="Keyprofile Title"
+                android:id="@+id/profile_issuer"
+                android:text="Issuer"
                 android:textColor="?attr/secondaryText"
                 android:includeFontPadding="false"
                 android:textSize="15sp"
@@ -66,12 +66,12 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/profile_issuer"
-                android:text=" - Issuer"
+                android:id="@+id/profile_account_name"
+                android:text=" - AccountName"
                 android:textColor="@color/extra_info_text"
                 android:includeFontPadding="false"
                 android:textSize="15sp"
-                android:layout_toRightOf="@id/profile_name"
+                android:layout_toRightOf="@id/profile_issuer"
                 android:layout_below="@id/profile_code"
                 android:ellipsize="end"
                 android:maxLines="1"/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9e4f336a..135af05d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,8 +11,8 @@
     <string name="settings">Preferences</string>
     <string name="pref_dark_mode_title">Dark mode</string>
     <string name="pref_dark_mode_summary">Enable this to use darker colors</string>
-    <string name="pref_issuer_title">Show the issuer</string>
-    <string name="pref_issuer_summary">Enable this to show the issuer next to the profile name</string>
+    <string name="pref_account_name_title">Show the account name</string>
+    <string name="pref_account_name_summary">Enable this to show the account name next to the issuer</string>
     <string name="pref_timeout_title">Timeout</string>
     <string name="pref_timeout_summary">Automatically lock the database after %1$s seconds of inactivity</string>
     <string name="pref_slots_title">Key slots</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 0c6a52dd..9024e586 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -12,9 +12,9 @@
 
         <android.support.v7.preference.SwitchPreferenceCompat
             android:defaultValue="false"
-            android:key="pref_issuer"
-            android:title="@string/pref_issuer_title"
-            android:summary="@string/pref_issuer_summary"/>
+            android:key="pref_account_name"
+            android:title="@string/pref_account_name_title"
+            android:summary="@string/pref_account_name_summary"/>
     </PreferenceCategory>
 
     <PreferenceCategory