From 12fff108ea0d538478ccdba3e4e8052a32f15054 Mon Sep 17 00:00:00 2001
From: Nano Akron <nanoakron@users.noreply.github.com>
Date: Mon, 24 Apr 2017 20:27:12 +0100
Subject: [PATCH] Change Old_English to English_Old - 'Old English' is actually
 a language

---
 src/mnemonics/CMakeLists.txt                   |  2 +-
 src/mnemonics/electrum-words.cpp               |  4 ++--
 src/mnemonics/electrum-words.h                 |  2 +-
 src/mnemonics/{old_english.h => english_old.h} | 12 ++++++------
 tests/unit_tests/mnemonics.cpp                 |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename src/mnemonics/{old_english.h => english_old.h} (94%)

diff --git a/src/mnemonics/CMakeLists.txt b/src/mnemonics/CMakeLists.txt
index 4db19d19..c521a093 100644
--- a/src/mnemonics/CMakeLists.txt
+++ b/src/mnemonics/CMakeLists.txt
@@ -41,7 +41,7 @@ set(mnemonics_private_headers
   italian.h
   japanese.h
   language_base.h
-  old_english.h
+  english_old.h
   portuguese.h
   russian.h
   singleton.h
diff --git a/src/mnemonics/electrum-words.cpp b/src/mnemonics/electrum-words.cpp
index c7c86f08..ef1100a1 100644
--- a/src/mnemonics/electrum-words.cpp
+++ b/src/mnemonics/electrum-words.cpp
@@ -61,7 +61,7 @@
 #include "portuguese.h"
 #include "japanese.h"
 #include "russian.h"
-#include "old_english.h"
+#include "english_old.h"
 #include "language_base.h"
 #include "singleton.h"
 
@@ -95,7 +95,7 @@ namespace
       Language::Singleton<Language::Portuguese>::instance(),
       Language::Singleton<Language::Japanese>::instance(),
       Language::Singleton<Language::Russian>::instance(),
-      Language::Singleton<Language::OldEnglish>::instance()
+      Language::Singleton<Language::EnglishOld>::instance()
     });
     Language::Base *fallback = NULL;
 
diff --git a/src/mnemonics/electrum-words.h b/src/mnemonics/electrum-words.h
index d1aa6593..3655dd20 100644
--- a/src/mnemonics/electrum-words.h
+++ b/src/mnemonics/electrum-words.h
@@ -60,7 +60,7 @@ namespace crypto
   {
 
     const int seed_length = 24;
-    const std::string old_language_name = "OldEnglish";
+    const std::string old_language_name = "EnglishOld";
     /*!
      * \brief Converts seed words to bytes (secret key).
      * \param  words           String containing the words separated by spaces.
diff --git a/src/mnemonics/old_english.h b/src/mnemonics/english_old.h
similarity index 94%
rename from src/mnemonics/old_english.h
rename to src/mnemonics/english_old.h
index 21ac95de..9fa5e81e 100644
--- a/src/mnemonics/old_english.h
+++ b/src/mnemonics/english_old.h
@@ -29,13 +29,13 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*!
- * \file old_english.h
+ * \file english_old.h
  * 
- * \brief Old English word list and map.
+ * \brief Older version of English word list and map.
  */
 
-#ifndef OLD_ENGLISH_H
-#define OLD_ENGLISH_H
+#ifndef ENGLISH_OLD_H
+#define ENGLISH_OLD_H
 
 #include <vector>
 #include <unordered_map>
@@ -48,10 +48,10 @@
  */
 namespace Language
 {
-  class OldEnglish: public Base
+  class EnglishOld: public Base
   {
   public:
-    OldEnglish(): Base("OldEnglish", std::vector<std::string>({
+    EnglishOld(): Base("EnglishOld", std::vector<std::string>({
         "like",
         "just",
         "love",
diff --git a/tests/unit_tests/mnemonics.cpp b/tests/unit_tests/mnemonics.cpp
index e00b87e3..956c5e1b 100644
--- a/tests/unit_tests/mnemonics.cpp
+++ b/tests/unit_tests/mnemonics.cpp
@@ -44,7 +44,7 @@
 #include "mnemonics/russian.h"
 #include "mnemonics/french.h"
 #include "mnemonics/dutch.h"
-#include "mnemonics/old_english.h"
+#include "mnemonics/english_old.h"
 #include "mnemonics/language_base.h"
 #include "mnemonics/singleton.h"