diff --git a/app/languages/en.json b/app/languages/en.json
index d128223..fecfce1 100644
--- a/app/languages/en.json
+++ b/app/languages/en.json
@@ -1,43 +1,16 @@
 {
-	"APP_NAME":"Accreditation",
-	
-	"MENU_OTHER_SYSTEMS": "Other Systems",
-	"SYSTEM_REGO": "Registrations",
-	"SYSTEM_EVENTS": "Events",
-	"SYSTEM_AUTH": "Auth Admin",
-	"SYSTEM_GLOSSARY": "Glossary",
-	"SYSTEM_PEOPLE": "People",
-	"SYSTEM_RESOURCES": "Resource Manager",
-	
-	"EventListHeading":"Events",
-	"Name": "Name",
-	"StartDate": "Start Date",
-	"EndDate": "End Date",
-	
-	"PeopleListHeading": "Accredited People for",
-	"Position": "Position",
-	"Skills": "Skills",
-	"Country": "Country",
-	"NoPeople": "No people found matching your search criteria",
-	"Filter": "Filter",
-	"Clear": "Clear",
-	"FirstName": "First Name",
-	"LastName": "Last Name",
-	"FirstNameDesc": "First Name descending",
-	"LastNameDesc": "Last Name descending",
-	"SetFilter": "Set Filter",
-	
-	"AccSpecHeading": "Accreditation-Specific Information",
-	"Organization": "Organization",
-	"HideCountry": "Hide Country",
-	"PeopleDataHeading": "Data from People Service",
-	"Positions": "Positions",
-	"Pacman": "Pacman ID",
-	"Save": "Save",
-	"PersonSaveMsg": "Accreditation data saved",
-	"ViewInPeople": "View in People",
-	"DelegateType": "Delegate Type",
-	"Email": "Email Address"
-	
-
-}
\ No newline at end of file
+    "name": "Name",
+    "start_date": "Start Date",
+    "end_date": "End Date",
+    "error_no_events": "No Events found",
+    "login": "Login",
+    "logout": "Logout",
+    "delegate_type": "Delegate Type",
+    "skill": "Skill",
+    "member": "Member",
+    "clear": "Clear",
+    "filter": "Filter",
+    "position": "Position",
+    "country": "Country",
+    "set_filter": "Set Filter"
+}
diff --git a/app/views/event_list.html b/app/views/event_list.html
index f397fd8..52e1cff 100644
--- a/app/views/event_list.html
+++ b/app/views/event_list.html
@@ -20,9 +20,9 @@ <h1>Events</h1>
 				</colgroup>
 				<thead>
 					<tr>
-						<th><span translate>Name</span></th>
-						<th><span translate>StartDate</span></th>
-						<th><span translate>EndDate</span></th>
+						<th><span translate>name</span></th>
+						<th><span translate>start_date</span></th>
+						<th><span translate>end_date</span></th>
 					</tr>
 				</thead>
 				<tbody>
@@ -32,7 +32,7 @@ <h1>Events</h1>
 						<td>{{event.end_date | date:'dd.MM.yyyy'}}</td>
 					</tr>
 					<tr ng-show="events.total_count == 0">
-						<td colspan="8"><span translate>NoResources</span></td>
+						<td colspan="8"><span translate>error_no_events</span></td>
 					</tr>
 
 				</tbody>
diff --git a/app/views/main.html b/app/views/main.html
index a3e21db..75e8143 100644
--- a/app/views/main.html
+++ b/app/views/main.html
@@ -10,17 +10,17 @@
             <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
                 <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="#" ng-cloak translate>APP_NAME</a>
+            <a class="navbar-brand" href="#" ng-cloak>Accreditation</a>
         </div>
         <div class="collapse navbar-collapse navbar-ex1-collapse">
             <ul class="nav navbar-nav navbar-right">
-                <li ng-show="!auth.loggedIn"><a href="{{auth.loginUrl}}" translate>LOGIN</a></li>
+                <li ng-show="!auth.loggedIn"><a href="{{auth.loginUrl}}" translate>login</a></li>
                 <li class="dropdown" ng-show="auth.loggedIn">
                     <a href="" class="dropdown-toggle" data-toggle="dropdown">
                         <span ng-bind="auth.user.first_name + ' ' + auth.user.last_name"></span> <b class="caret"></b>
                     </a>
                     <ul class="dropdown-menu">
-                        <li><a href="" ng-click="logout()" translate>LOGOUT</a></li>
+                        <li><a href="" ng-click="logout()" translate>logout</a></li>
                     </ul></li>
             </ul>
         </div>
diff --git a/app/views/people.html b/app/views/people.html
index 6049cc3..36a617a 100755
--- a/app/views/people.html
+++ b/app/views/people.html
@@ -13,10 +13,10 @@
                 </colgroup>
                 <thead>
                     <tr>
-                        <th><span translate>Name</span></th>
-                        <th><span translate>Delegate Type</span></th>
-                        <th><span translate>Skill</span></th>
-                        <th><span translate>Member</span></th>
+                        <th><span translate>name</span></th>
+                        <th><span translate>delegate_type</span></th>
+                        <th><span translate>skill</span></th>
+                        <th><span translate>member</span></th>
                     </tr>
                 </thead>
                 <tbody>
@@ -50,35 +50,35 @@
         <form name="form" novalidate ng-controller="PeopleFilterController" ng-disabled="loading">
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <a class="pull-right" href="" ng-click="clear()" translate>Clear</a>
-                    <h3 class="panel-title" translate>Filter</h3>
+                    <a class="pull-right" href="" ng-click="clear()" translate>clear</a>
+                    <h3 class="panel-title" translate>filter</h3>
                 </div>
                 <div class="panel-body">
                     <form role="form" >
                         <div class="form-group">
-                            <label for="name">Name</label>
+                            <label for="name" translate>name</label>
                             <input ng-model="filter.name" class="form-control input-sm" id="name"/>
                         </div>
                         <div class="form-group">
-                            <label for="dt" translate>DelegateType</label>
+                            <label for="dt" translate>delegate_type</label>
                             <select ng-model="filter.delegateTypes" class="form-control" name="dt" id="dt">
                                 <option value=""></option>
                                 <option ng-repeat="dt in delegateTypes.delegate_types" value="{{dt.id}}">{{dt.name}}</option>
                             </select>
                         </div>
                         <div class="form-group">
-                            <label for="position" translate>Position</label>
+                            <label for="position" translate>position</label>
                             <input ng-model="filter.position" class="form-control input-sm" id="position"/>
                         </div>
                         <div class="form-group">
-                            <label for="country" translate>Country</label>
+                            <label for="country" translate>country</label>
                             <select ng-model="filter.country" class="form-control" name="country" id="country">
                                 <option></option>
                                 <option ng-repeat="country in countries" value="{{country.code}}">{{country.code}} - {{country.name.text}}</option>
                             </select>
                         </div>
                         <div class="form-group">
-                            <label for="skill" translate>Skill</label>
+                            <label for="skill" translate>skill</label>
                             <select ng-model="filter.skill" class="form-control" name="skill" id="skill">
                                 <option></option>
                                 <option ng-repeat="skill in skills" value="{{skill.id}}">{{skill.skill_number}} {{skill.name.text}}</option>
@@ -86,7 +86,7 @@ <h3 class="panel-title" translate>Filter</h3>
                         </div>
                         <div class="btn-toolbar pull-right">
                           <a ui-sref="print(filter)" class="btn btn-warning" target="_blank">Print</a>
-                          <a ng-click="filterResults()" class="btn btn-primary" ng-disabled="loading || deleting"><span translate>SetFilter</span><spinner ng-show="loading" class="ng-hide"></spinner></a>
+                          <a ng-click="filterResults()" class="btn btn-primary" ng-disabled="loading || deleting"><span translate>set_filter</span><spinner ng-show="loading" class="ng-hide"></spinner></a>
                         </div>
                     </form>
                 </div>