diff --git a/mindplot/resources/messages_es.json b/mindplot/resources/messages_es.json
deleted file mode 100644
index b832d981..00000000
--- a/mindplot/resources/messages_es.json
+++ /dev/null
@@ -1,41 +0,0 @@
-ZOOM_IN:'Zoom In',
-ZOOM_OUT:'Zoom Out',
-TOPIC_SHAPE:'Topic Shape',
-TOPIC_ADD:'Add Topic',
-TOPIC_DELETE:'Delete Topic',
-TOPIC_ICON:'Add Icon',
-TOPIC_LINK:'Add Link',
-TOPIC_RELATIONSHIP:'Relationship',
-TOPIC_COLOR:'Topic Color',
-TOPIC_BORDER_COLOR:'Topic Border Color',
-TOPIC_NOTE:'Add Note',
-FONT_FAMILY:'Font Type',
-FONT_SIZE:'Text Size',
-FONT_BOLD:'Text Bold',
-FONT_ITALIC:'Text Italic',
-UNDO_EDITION:'Undo Edition',
-REDO_EDITION:'Redo Edition',
-UNDO:'Undo',
-REDO:'Redo',
-INSERT:'Insert',
-SAVE:'Save',
-NOTE:'Note',
-
-ADD_TOPIC:'Add Topic',
-LOADING:'Loading ...',
-EXPORT:'Export',
-PRINT:'Print',
-PUBLISH:'Publish',
-COLLABORATE:'Share',
-HISTORY:'History',
-DISCARD_CHANGES:'Discard Changes',
-FONT_COLOR:'Text Color',
-SAVING:'Saving ...',
-SAVE_COMPLETE:'Save Complete',
-
-ZOOM_IN_ERROR:'Zoom too high.',
-ZOOM_ERROR:'No more zoom can be applied.',
-ONLY_ONE_TOPIC_MUST_BE_SELECTED:'Could not create a topic. Only one node must be selected.',
-ONE_TOPIC_MUST_BE_SELECTED:'Could not create a topic. One topic must be selected.',
-SAVE_COULD_NOT_BE_COMPLETED:'Save could not be completed. Try latter.',
-UNEXPECTED_ERROR_LOADING:'We're sorry, an unexected error has occurred. Try again realoading the editor.If the problem persists, contact us to <a href\='mailto\:support@wisemapping.com'>support@wisemapping.com</a>.',
diff --git a/mindplot/resources/messages_en.properties b/mindplot/src/main/resources/messages_en.properties
similarity index 100%
rename from mindplot/resources/messages_en.properties
rename to mindplot/src/main/resources/messages_en.properties
diff --git a/mindplot/resources/messages_es.properties b/mindplot/src/main/resources/messages_es.properties
similarity index 100%
rename from mindplot/resources/messages_es.properties
rename to mindplot/src/main/resources/messages_es.properties
diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_en.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_en.properties
index fa20c5fa..c9930193 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_en.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_en.properties
@@ -5,8 +5,8 @@ VIEWERS=Viewers
 USER_REGISTRATION=User Registration
 SEND_ME_A_NEW_PASSWORD=Send Me A New Password
 CANCEL=Cancel
-FIRSTNAME=Firstname
-LASTNAME=Lastname
+FIRSTNAME=First Name
+LASTNAME=Last Name
 EMAIL=Email
 HELP=Help
 LOGOUT=Logout
@@ -60,7 +60,7 @@ PASSWORD_MISSMATCH=Your password entries did not match
 CHANGE_PASSWORD_SUCCESS=Your password has been changed successfully.
 WISEMAPPING_ACCOUNT_MESSAGE=Please check the WiseMapping Account information you've entered above, and review the Terms of Service
 REGISTRATION_CLICK_ADVICE= By clicking on 'Register' below you are agreeing to the Terms of Service above and the Privacy Policy.
-REGISTRATION_TITLE_MSG=Please, fill the fields and become a member of WiseMapping community.Registration is <b> Free</b> and takes just a moment.
+REGISTRATION_TITLE_MSG=Please, fill the fields and become a member of WiseMapping community. Registration is <b> Free</b> and takes just a moment.
 CAPTCHA_ERROR=Enter the letters as they are shown in the image above.
 CREATOR=Creator
 CREATION_TIME=Creation Time
@@ -158,7 +158,7 @@ FRAME_WIDTH=Frame width
 EMBED=Embebber
 PUBLIC_URL=Public URLs
 ADD_PEOPLE=Add People
-COLLABORATORS_SEPARATED_BY_COMA=Enter collaborators emails separared by comas
+COLLABORATORS_SEPARATED_BY_COMA=Enter collaborators emails separated by comas
 CAN_EDIT=Can Edit
 CAN_VIEW=Can View
 EMAIL_NOTIFICATION_MESSAGE=Customize Email Notification