diff --git a/frontend/apps/filemanager/filemanagersearch.lua b/frontend/apps/filemanager/filemanagersearch.lua
index 2d93250b0..f4269f07c 100644
--- a/frontend/apps/filemanager/filemanagersearch.lua
+++ b/frontend/apps/filemanager/filemanagersearch.lua
@@ -304,7 +304,7 @@ function Search:find(option)
         if self.use_own_metadata_file then
             local g = io.open(koreaderfile, "r")
             line = g:read()
-            if line ~= "#metadata.Koreader Version 1.1" then
+            if line ~= "#metadata.Koreader Version 1.1" and line ~= "#metadata.koreader Version 1.1" then
                 self.use_own_metadata_file =  false
                 g:close()
             else
@@ -365,7 +365,7 @@ function Search:find(option)
         if not self.use_own_metadata_file then
             f = io.open(self.metafile_1)
             g = io.open(koreaderfile,"w")
-            g:write("#metadata.Koreader Version 1.1\n")
+            g:write("#metadata.koreader Version 1.1\n")
 
             line = f:read()
             while line do
diff --git a/frontend/apps/reader/modules/readerhighlight.lua b/frontend/apps/reader/modules/readerhighlight.lua
index 6065f3bba..8d96adbd3 100644
--- a/frontend/apps/reader/modules/readerhighlight.lua
+++ b/frontend/apps/reader/modules/readerhighlight.lua
@@ -453,7 +453,7 @@ function ReaderHighlight:exportToClippings(page, item)
         local current_locale = os.setlocale()
         os.setlocale("C")
         clippings:write(self.document.file:gsub("(.*/)(.*)", "%2").."\n")
-        clippings:write("- Koreader Highlight Page "..page.." ")
+        clippings:write("- KOReader Highlight Page "..page.." ")
         clippings:write("| Added on "..os.date("%A, %b %d, %Y %I:%M:%S %p\n\n"))
         -- My Clippings only holds one line of highlight
         clippings:write(item["text"]:gsub("\n", " ").."\n")
diff --git a/frontend/apps/reader/modules/readerpaging.lua b/frontend/apps/reader/modules/readerpaging.lua
index 6e5ddb03b..0976e583e 100644
--- a/frontend/apps/reader/modules/readerpaging.lua
+++ b/frontend/apps/reader/modules/readerpaging.lua
@@ -755,7 +755,7 @@ function ReaderPaging:onGotoPageRel(diff)
         -- calculate panning offsets
         local panned_x = new_va.x - self.visible_area.x
         local panned_y = new_va.y - self.visible_area.y
-        -- adjust for crazy float point overflow...
+        -- adjust for crazy floating point overflow...
         if math.abs(panned_x) < 1 then
             panned_x = 0
         end
diff --git a/plugins/calibrecompanion.koplugin/main.lua b/plugins/calibrecompanion.koplugin/main.lua
index f970df69f..43143646b 100644
--- a/plugins/calibrecompanion.koplugin/main.lua
+++ b/plugins/calibrecompanion.koplugin/main.lua
@@ -10,7 +10,7 @@ local dummy = require("ffi/zeromq_h")
 
 --[[
     This plugin implements a simple Calibre Companion protocol that communicates
-    with Calibre Wireless Server from which users can send documents to Koreader
+    with Calibre Wireless Server from which users can send documents to KOReader
     devices directly with WIFI connection.
 
     Note that Calibre Companion(CC) is a trade mark held by MultiPie Ltd. The
@@ -243,16 +243,16 @@ function CalibreCompanion:getInitInfo(arg)
         passwordHash = "",
         canReceiveBookBinary = true,
         maxBookContentPacketLen = 4096,
-        appName = "Koreader Calibre plugin",
+        appName = "KOReader Calibre plugin",
         ccVersionNumber = 106,
-        deviceName = "Koreader",
+        deviceName = "KOReader",
         canStreamBooks = true,
         versionOK = true,
         canDeleteMultipleBooks = true,
         canSendOkToSendbook = true,
         coverHeight = 240,
         cacheUsesLpaths = true,
-        deviceKind = "Koreader",
+        deviceKind = "KOReader",
     }
     self:sendJsonData('OK', init_info)
 end
@@ -262,10 +262,10 @@ function CalibreCompanion:getDeviceInfo(arg)
     local device_info = {
         device_info = {
            device_store_uuid = G_reader_settings:readSetting("device_store_uuid"),
-           device_name = "Koreader Calibre Companion",
+           device_name = "KOReader Calibre Companion",
         },
         version  = 106,
-        device_version = "koreader",
+        device_version = "KOReader",
     }
     self:sendJsonData('OK', device_info)
 end
diff --git a/plugins/evernote.koplugin/clip.lua b/plugins/evernote.koplugin/clip.lua
index 8e255030a..f17eaf95e 100644
--- a/plugins/evernote.koplugin/clip.lua
+++ b/plugins/evernote.koplugin/clip.lua
@@ -98,7 +98,7 @@ local extensions = {
     [".doc"] = true,
 }
 
--- remove file extensions added by former Koreader
+-- remove file extensions added by former KOReader
 -- extract author name in "Title(Author)" format
 -- extract author name in "Title - Author" format
 function MyClipping:getTitle(line)
diff --git a/plugins/kosync.koplugin/main.lua b/plugins/kosync.koplugin/main.lua
index 58ac0ad7d..fd548d7b6 100644
--- a/plugins/kosync.koplugin/main.lua
+++ b/plugins/kosync.koplugin/main.lua
@@ -22,7 +22,7 @@ local l10n = {
 
 local KOSync = InputContainer:new{
     name = "kosync",
-    title = _("Register/login to Koreader server"),
+    title = _("Register/login to KOReader server"),
 }
 
 function KOSync:init()
@@ -177,7 +177,7 @@ function KOSync:doRegister(username, password)
             self.kosync_username = username
             self.kosync_userkey = userkey
             UIManager:show(InfoMessage:new{
-                text = _("Registered to Koreader server successfully."),
+                text = _("Registered to KOReader server successfully."),
             })
         else
             UIManager:show(InfoMessage:new{
@@ -207,7 +207,7 @@ function KOSync:doLogin(username, password)
             self.kosync_username = username
             self.kosync_userkey = userkey
             UIManager:show(InfoMessage:new{
-                text = _("Logged in to Koreader server successfully."),
+                text = _("Logged in to KOReader server successfully."),
             })
         else
             UIManager:show(InfoMessage:new{