diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 302ec5bd3..dac0ff5b5 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -4,7 +4,7 @@
     <div class='userinformation-inner'>
       <h1><%= @user.display_name %> <%= role_icons(@user) %></h1>
       <% if current_user and @user.id == current_user.id %>
-        <!-- Displaying user's own profile page to themself -->
+        <!-- Displaying user's own profile page -->
         <ul class='secondary-actions clearfix'>
           <li>
             <%= link_to t(".my edits"), :controller => "changesets", :action => "index", :display_name => current_user.display_name %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 72f02fbf1..fce1f8913 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -152,7 +152,7 @@ en:
       trace:
         tagstring: comma delimited
       user_block:
-        reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms.
+        reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use layman's terms.
         needs_view: Does the user need to log in before this block will be cleared?
       user:
         email_confirmation: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information.'
@@ -697,7 +697,7 @@ en:
           houseboat: "Houseboat"
           hut: "Hut"
           industrial: "Industrial Building"
-          kindergarten: "Kindergarden Building"
+          kindergarten: "Kindergarten Building"
           manufacture: "Manufacturing Building"
           office: "Office Building"
           public: "Public Building"
@@ -722,7 +722,7 @@ en:
           sport: "Sportsclub"
           "yes": "Club"
         craft:
-          beekeper: "Beekeeper"
+          beekeeper: "Beekeeper"
           blacksmith: "Blacksmith"
           brewery: "Brewery"
           carpenter: "Carpenter"
@@ -752,7 +752,7 @@ en:
           ambulance_station: "Ambulance Station"
           assembly_point: "Assembly Point"
           defibrillator: "Defibrillator"
-          fire_xtinguisher: "Fire Extinguisher"
+          fire_extinguisher: "Fire Extinguisher"
           fire_water_pond: "Fire Water Pond"
           landing_site: "Emergency Landing Site"
           life_ring: "Emergency Life Ring"
diff --git a/lib/osm.rb b/lib/osm.rb
index b6dd64b99..005d3ebb8 100644
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -474,7 +474,7 @@ module OSM
 
   # Construct a random token of a given length
   def self.make_token(length = 30)
-    chars = "abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+    chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
     token = ""
 
     length.times do
diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb
index 567f77fd3..8e8f4c185 100644
--- a/test/controllers/api/changesets_controller_test.rb
+++ b/test/controllers/api/changesets_controller_test.rb
@@ -63,7 +63,7 @@ module Api
             "</changeset></osm>"
       put changeset_create_path, :params => xml, :headers => auth_header
 
-      assert_response :success, "Creation of changeset did not return sucess status"
+      assert_response :success, "Creation of changeset did not return success status"
       newid = @response.body.to_i
 
       # check end time, should be an hour ahead of creation time
@@ -700,7 +700,7 @@ module Api
       # upload it
       post changeset_upload_path(changeset), :params => diff, :headers => auth_header
       assert_response :bad_request,
-                      "shoudln't be able to upload too long a tag to changeset: #{@response.body}"
+                      "shouldn't be able to upload too long a tag to changeset: #{@response.body}"
     end
 
     ##
@@ -1326,7 +1326,7 @@ module Api
           <node id='-7' visible='true' changeset='#{changeset_id}' lat='51.49560784152179' lon='-0.18694719410005425' />
           <node id='-8' visible='true' changeset='#{changeset_id}' lat='51.49567389979617' lon='-0.1860289771788006' />
           <node id='-9' visible='true' changeset='#{changeset_id}' lat='51.49543761398892' lon='-0.186820684213126' />
-          <way id='-10' action='modiy' visible='true' changeset='#{changeset_id}'>
+          <way id='-10' action='modify' visible='true' changeset='#{changeset_id}'>
             <nd ref='-1' />
             <nd ref='-2' />
             <nd ref='-3' />
diff --git a/test/controllers/api/map_controller_test.rb b/test/controllers/api/map_controller_test.rb
index 433e7a2af..1e96e353c 100644
--- a/test/controllers/api/map_controller_test.rb
+++ b/test/controllers/api/map_controller_test.rb
@@ -129,7 +129,7 @@ module Api
         print @request.to_yaml
         print @response.body
       end
-      assert_response :success, "Expected scucess with the map call"
+      assert_response :success, "Expected success with the map call"
       assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do
         assert_select "bounds[minlon='#{format('%<lon>.7f', :lon => minlon)}']" \
                       "[minlat='#{format('%<lat>.7f', :lat => minlat)}']" \
diff --git a/test/controllers/api/nodes_controller_test.rb b/test/controllers/api/nodes_controller_test.rb
index b085dee9d..95658842b 100644
--- a/test/controllers/api/nodes_controller_test.rb
+++ b/test/controllers/api/nodes_controller_test.rb
@@ -86,7 +86,7 @@ module Api
     end
 
     def test_create_invalid_xml
-      ## Only test public user here, as test_create should cover what's the forbiddens
+      ## Only test public user here, as test_create should cover what's the forbidden
       ## that would occur here
 
       user = create(:user)
diff --git a/test/controllers/friendships_controller_test.rb b/test/controllers/friendships_controller_test.rb
index b25986d84..6273caaf2 100644
--- a/test/controllers/friendships_controller_test.rb
+++ b/test/controllers/friendships_controller_test.rb
@@ -110,7 +110,7 @@ class FriendshipsControllerTest < ActionDispatch::IntegrationTest
     ActionMailer::Base.deliveries.clear
   end
 
-  def test_make_friend_unkown_user
+  def test_make_friend_unknown_user
     # Should error when a bogus user is specified
     session_for(create(:user))
     get make_friend_path(:display_name => "No Such User")
@@ -188,7 +188,7 @@ class FriendshipsControllerTest < ActionDispatch::IntegrationTest
     assert_nil Friendship.where(:befriender => user, :befriendee => friend).first
   end
 
-  def test_remove_friend_unkown_user
+  def test_remove_friend_unknown_user
     # Should error when a bogus user is specified
     session_for(create(:user))
     get remove_friend_path(:display_name => "No Such User")
diff --git a/test/models/relation_tag_test.rb b/test/models/relation_tag_test.rb
index 429e77a92..02d6d95c7 100644
--- a/test/models/relation_tag_test.rb
+++ b/test/models/relation_tag_test.rb
@@ -37,7 +37,7 @@ class RelationTagTest < ActiveSupport::TestCase
     assert tag.errors[:relation].any?
   end
 
-  def test_uniquness
+  def test_uniqueness
     existing = create(:relation_tag)
     tag = RelationTag.new
     tag.relation_id = existing.relation_id
diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index 4c84d44fc..55e8b1b26 100644
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -58,7 +58,7 @@ class IssuesTest < ApplicationSystemTestCase
 
     # User doesn't exist
     visit issues_path
-    fill_in "search_by_user", :with => "Nonexistant User"
+    fill_in "search_by_user", :with => "Nonexistent User"
     click_on "Search"
     assert page.has_content?(I18n.t("issues.index.user_not_found"))
     assert page.has_content?(I18n.t("issues.index.issues_not_found"))