diff --git a/templates/manage/general/emoticon.twig b/templates/manage/general/emoticon.twig
index 4f87a799..3fbd98e2 100644
--- a/templates/manage/general/emoticon.twig
+++ b/templates/manage/general/emoticon.twig
@@ -8,22 +8,22 @@
     <div class="container manage__emotes">
         {{ container_title('<i class="fas fa-grimace fa-fw"></i> ' ~ title) }}
 
-        <form method="post" action="{{ url('manage-general-emoticon', {'emote': emote_info.emote_id|default(0)}) }}" class="manage__emote">
+        <form method="post" action="{{ url('manage-general-emoticon', {'emote': emote_info.id|default(0)}) }}" class="manage__emote">
             {{ input_csrf() }}
 
             <label class="manage__emote__field">
                 <div class="manage__emote__field__name">Order</div>
-                {{ input_text('emote_order', 'manage__emote__field__value', emote_info.emote_order|default(0), 'number') }}
+                {{ input_text('emote_order', 'manage__emote__field__value', emote_info.order|default(0), 'number') }}
             </label>
 
             <label class="manage__emote__field">
                 <div class="manage__emote__field__name">Hierarchy</div>
-                {{ input_text('emote_hierarchy', 'manage__emote__field__value', emote_info.emote_hierarchy|default(0), 'number') }}
+                {{ input_text('emote_hierarchy', 'manage__emote__field__value', emote_info.rank|default(0), 'number') }}
             </label>
 
             <label class="manage__emote__field">
                 <div class="manage__emote__field__name">URL</div>
-                {{ input_text('emote_url', 'manage__emote__field__value', emote_info.emote_url|default(), 'text', '', true) }}
+                {{ input_text('emote_url', 'manage__emote__field__value', emote_info.url|default(), 'text', '', true) }}
             </label>
 
             <label class="manage__emote__field">
diff --git a/templates/manage/general/emoticons.twig b/templates/manage/general/emoticons.twig
index 9e1882fe..1c63c6ed 100644
--- a/templates/manage/general/emoticons.twig
+++ b/templates/manage/general/emoticons.twig
@@ -22,7 +22,7 @@
                     Order
                 </div>
                 <div class="manage__emotes__entry__hierarchy">
-                    Hier.
+                    Rank
                 </div>
                 <div class="manage__emotes__entry__image">
                     Image
@@ -33,25 +33,25 @@
             </div>
 
             {% for emote in emotes %}
-                <div id="emote-{{ emote.emote_id }}" class="manage__emotes__entry">
+                <div id="emote-{{ emote.id }}" class="manage__emotes__entry">
                     <div class="manage__emotes__entry__id">
-                        #{{ emote.emote_id }}
+                        #{{ emote.id }}
                     </div>
                     <div class="manage__emotes__entry__order">
-                        {{ emote.emote_order }}
+                        {{ emote.order }}
                     </div>
                     <div class="manage__emotes__entry__hierarchy">
-                        {{ emote.emote_hierarchy }}
+                        {{ emote.rank }}
                     </div>
                     <div class="manage__emotes__entry__image">
-                        <img src="{{ emote.emote_url }}" alt="{{ emote.emote_url }}" class="emoticon manage__emotes__emoticon">
+                        <img src="{{ emote.url }}" alt="{{ emote.url }}" class="emoticon manage__emotes__emoticon">
                     </div>
                     <div class="manage__emotes__entry__actions">
-                        <button class="input__button input__button--autosize" title="Create Alias" onclick="createEmoteAlias({{ emote.emote_id }}, prompt('Enter an alias for this emoticon...'))"><i class="fas fa-copy fa-fw"></i></button>
-                        <a class="input__button input__button--autosize" href="{{ url('manage-general-emoticon', {'emote': emote.emote_id}) }}" title="Edit"><i class="fas fa-edit fa-fw"></i></a>
-                        <a class="input__button input__button--autosize input__button--destroy" href="{{ url('manage-general-emoticon-delete', {'emote': emote.emote_id}) }}" title="Delete" onclick="return confirm('ARE YOU SURE ABOUT THAT?');"><i class="fas fa-times fa-fw"></i></a>
-                        <a class="input__button input__button--autosize input__button--blue" href="{{ url('manage-general-emoticon-order-up', {'emote': emote.emote_id}) }}" title="Move up"><i class="fas fa-angle-up fa-fw"></i></a>
-                        <a class="input__button input__button--autosize input__button--blue" href="{{ url('manage-general-emoticon-order-down', {'emote': emote.emote_id}) }}" title="Move down"><i class="fas fa-angle-down fa-fw"></i></a>
+                        <button class="input__button input__button--autosize" title="Create Alias" onclick="createEmoteAlias({{ emote.id }}, prompt('Enter an alias for this emoticon...'))"><i class="fas fa-copy fa-fw"></i></button>
+                        <a class="input__button input__button--autosize" href="{{ url('manage-general-emoticon', {'emote': emote.id}) }}" title="Edit"><i class="fas fa-edit fa-fw"></i></a>
+                        <a class="input__button input__button--autosize input__button--destroy" href="{{ url('manage-general-emoticon-delete', {'emote': emote.id}) }}" title="Delete" onclick="return confirm('ARE YOU SURE ABOUT THAT?');"><i class="fas fa-times fa-fw"></i></a>
+                        <a class="input__button input__button--autosize input__button--blue" href="{{ url('manage-general-emoticon-order-up', {'emote': emote.id}) }}" title="Move up"><i class="fas fa-angle-up fa-fw"></i></a>
+                        <a class="input__button input__button--autosize input__button--blue" href="{{ url('manage-general-emoticon-order-down', {'emote': emote.id}) }}" title="Move down"><i class="fas fa-angle-down fa-fw"></i></a>
                     </div>
                 </div>
             {% endfor %}