diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index ad56e6341..5a87dde7d 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -5,7 +5,7 @@
       <% if comment.hidden? || comment.user.hidden? %>
         <% if select_children(@comments, comment).size > 0 %>
           <div class="is-deleted">
-            <p><%= t("comment.deleted") %></p>
+            <p><%= t("comments.comment.deleted") %></p>
           </div>
         <% end %>
       <% else %>
@@ -28,13 +28,13 @@
           <div class="comment-info">
 
             <% if comment.as_administrator? %>
-              <span class="user-name"><%= t("comment.admin") %> #<%= comment.administrator_id%></span>
+              <span class="user-name"><%= t("comments.comment.admin") %> #<%= comment.administrator_id%></span>
             <% elsif comment.as_moderator? %>
-              <span class="user-name"><%= t("comment.moderator") %> #<%= comment.moderator_id%></span>
+              <span class="user-name"><%= t("comments.comment.moderator") %> #<%= comment.moderator_id%></span>
             <% else %>
 
               <% if comment.user.hidden? %>
-                <span class="user-name"><%= t("comment.user_deleted") %></span>
+                <span class="user-name"><%= t("comments.comment.user_deleted") %></span>
               <% else %>
                 <span class="user-name"><%= comment.user.name %></span>
                 <% if comment.user.official? %>
@@ -53,7 +53,7 @@
               <% if comment.user_id == @commentable.author_id %>
                 &nbsp;&bull;&nbsp;
                 <span class="label round is-author">
-                  <%= t("comment.author") %>
+                  <%= t("comments.comment.author") %>
                 </span>
               <% end %>
 
@@ -80,7 +80,7 @@
           </span>
 
           <div class="reply">
-            <%= t("comment.responses", count: select_children(@comments, comment).size) %>
+            <%= t("comments.comment.responses", count: select_children(@comments, comment).size) %>
 
             <% if user_signed_in? %>
               <span class="divider">&nbsp;|&nbsp;</span>
diff --git a/app/views/comments/_votes.html.erb b/app/views/comments/_votes.html.erb
index 6b4e7e718..21ee52884 100644
--- a/app/views/comments/_votes.html.erb
+++ b/app/views/comments/_votes.html.erb
@@ -1,5 +1,5 @@
 <span>
-  <%= t('comment.votes', count: comment.total_votes) %>
+  <%= t('comments.comment.votes', count: comment.total_votes) %>
 </span>
 &nbsp;|&nbsp;
 <span class="in_favor">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 674972fd4..40b6c9fe5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -92,20 +92,6 @@ en:
         zero: No votes
         one: 1 vote
         other: "%{count} votes"
-    comment:
-      author: Debate's author
-      moderator: Moderator
-      admin: Administrator
-      deleted: This comment has been deleted
-      user_deleted: Deleted user
-      responses:
-        zero: No Responses
-        one: 1 Response
-        other: "%{count} Responses"
-      votes:
-        zero: No votes
-        one: 1 vote
-        other: "%{count} votes"
     form:
       debate_title: Debate title
       debate_text: Initial text for debate
@@ -180,20 +166,6 @@ en:
         zero: No votes
         one: 1 vote
         other: "%{count} votes"
-    comment:
-      author: Proposal's author
-      moderator: Moderator
-      admin: Administrator
-      deleted: This comment has been deleted
-      user_deleted: Deleted user
-      responses:
-        zero: No Responses
-        one: 1 Response
-        other: "%{count} Responses"
-      votes:
-        zero: No votes
-        one: 1 vote
-        other: "%{count} votes"
     form:
       proposal_title: Proposal title
       proposal_question: Proposal question
@@ -244,6 +216,20 @@ en:
       leave_comment: Write a comment
       comment_as_moderator: Comment as moderator
       comment_as_admin: Comment as administrator
+    comment:
+      author: Author
+      moderator: Moderator
+      admin: Administrator
+      deleted: This comment has been deleted
+      user_deleted: Deleted user
+      responses:
+        zero: No Responses
+        one: 1 Response
+        other: "%{count} Responses"
+      votes:
+        zero: No votes
+        one: 1 vote
+        other: "%{count} votes"
   comments_helper:
     comment_link: Comment
     comment_button: Publish comment
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 187947ff3..265680443 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -92,20 +92,6 @@ es:
         zero: Sin votos
         one: 1 voto
         other: "%{count} votos"
-    comment:
-      author: Autor del debate
-      moderator: Moderador
-      admin: Administrador
-      deleted: Este comentario ha sido eliminado
-      user_deleted: Usuario eliminado
-      responses:
-        zero: Sin respuestas
-        one: 1 Respuesta
-        other: "%{count} Respuestas"
-      votes:
-        zero: Sin votos
-        one: 1 voto
-        other: "%{count} votos"
     form:
       debate_title: Título del debate
       debate_text: Texto inicial del debate
@@ -180,20 +166,6 @@ es:
         zero: Sin votos
         one: 1 voto
         other: "%{count} votos"
-    comment:
-      author: Autor de la propuesta
-      moderator: Moderador
-      admin: Administrador
-      deleted: Este comentario ha sido eliminado
-      user_deleted: Usuario eliminado
-      responses:
-        zero: Sin respuestas
-        one: 1 Respuesta
-        other: "%{count} Respuestas"
-      votes:
-        zero: Sin votos
-        one: 1 voto
-        other: "%{count} votos"
     form:
       proposal_title: Título de la propuesta
       proposal_question: Pregunta de la propuesta
@@ -244,6 +216,20 @@ es:
       leave_comment: Deja tu comentario
       comment_as_moderator: Comentar como moderador
       comment_as_admin: Comentar como administrador
+    comment:
+      author: Autor
+      moderator: Moderador
+      admin: Administrador
+      deleted: Este comentario ha sido eliminado
+      user_deleted: Usuario eliminado
+      responses:
+        zero: Sin respuestas
+        one: 1 Respuesta
+        other: "%{count} Respuestas"
+      votes:
+        zero: Sin votos
+        one: 1 voto
+        other: "%{count} votos"
   comments_helper:
     comment_link: Comentar
     comment_button: Publicar comentario