diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java b/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
index 08ccaea0f..86c302d1d 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
@@ -85,7 +85,7 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
         new UserPicture(user, this.context).setPictureOn(image);
 
         if (user.getStats().get_class() != null) {
-            userClass += user.getStats().get_class().name();
+            userClass += user.getStats().getCleanedClassName();
         }
         lvlText.setText("Lvl" + user.getStats().getLvl() + " " + userClass);
         Drawable drawable;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/PartyMemberRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/PartyMemberRecyclerViewAdapter.java
index fa22dd846..fba0b7eb0 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/PartyMemberRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/PartyMemberRecyclerViewAdapter.java
@@ -98,7 +98,7 @@ public class PartyMemberRecyclerViewAdapter extends RecyclerView.Adapter<PartyMe
 
             lvl.setText("LVL " + user.getStats().getLvl());
 
-            classLabel.setText(user.getStats()._class.toString());
+            classLabel.setText(user.getStats().getCleanedClassName());
 
 
             switch (user.getStats()._class) {
diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java
index 6b94b387f..50a58793c 100644
--- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java
+++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java
@@ -71,6 +71,13 @@ public abstract class PlayerMinStats extends BasicStats {
         return _class;
     }
 
+    public String getCleanedClassName() {
+        if (_class.toString().equals("wizard")) {
+            return "mage";
+        }
+        return _class.toString();
+    }
+
     public void set_class(HabitRpgClass _class) {
         this._class = _class;
     }