From 604fbc1a752a168d481bce80fbf3d70e4c3b7fd4 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 18 Oct 2023 16:28:54 +0200
Subject: [PATCH 1/2] chore(linux): Rename namespace kbp to core

---
 common/include/kmx_file.h                     |  4 +-
 core/meson.build                              |  2 +-
 core/src/context.hpp                          |  8 ++--
 core/src/debug.hpp                            |  4 +-
 core/src/debuglog.cpp                         |  2 +-
 core/src/debuglog.h                           |  6 +--
 core/src/keyboard.cpp                         |  4 +-
 core/src/keyboard.hpp                         | 10 ++---
 core/src/km_core_context_api.cpp              |  2 +-
 core/src/km_core_debug_api.cpp                |  2 +-
 core/src/km_core_keyboard_api.cpp             |  2 +-
 core/src/km_core_state_api.cpp                |  2 +-
 core/src/kmx/kmx_actions.cpp                  |  2 +-
 core/src/kmx/kmx_actions.h                    |  4 +-
 core/src/kmx/kmx_base.h                       |  4 +-
 core/src/kmx/kmx_capslock.cpp                 |  2 +-
 core/src/kmx/kmx_consts.cpp                   |  4 +-
 core/src/kmx/kmx_context.cpp                  |  2 +-
 core/src/kmx/kmx_context.h                    |  4 +-
 core/src/kmx/kmx_conversion.cpp               |  4 +-
 core/src/kmx/kmx_conversion.h                 |  4 +-
 core/src/kmx/kmx_debugger.cpp                 |  4 +-
 core/src/kmx/kmx_debugger.h                   |  6 +--
 core/src/kmx/kmx_environment.cpp              |  2 +-
 core/src/kmx/kmx_environment.h                |  4 +-
 core/src/kmx/kmx_file.cpp                     |  4 +-
 core/src/kmx/kmx_file_validator.hpp           |  4 +-
 core/src/kmx/kmx_modifiers.cpp                |  8 ++--
 core/src/kmx/kmx_options.cpp                  |  2 +-
 core/src/kmx/kmx_options.h                    |  4 +-
 core/src/kmx/kmx_plus.cpp                     |  6 +--
 core/src/kmx/kmx_plus.h                       |  6 +--
 core/src/kmx/kmx_processevent.cpp             | 24 +++++------
 core/src/kmx/kmx_processevent.h               |  6 +--
 core/src/kmx/kmx_processor.cpp                |  8 ++--
 core/src/kmx/kmx_processor.hpp                |  4 +-
 core/src/kmx/kmx_xstring.cpp                  | 38 ++++++++---------
 core/src/kmx/kmx_xstring.h                    | 16 +++----
 core/src/ldml/ldml_processor.cpp              | 14 +++----
 core/src/ldml/ldml_processor.hpp              |  4 +-
 core/src/ldml/ldml_transforms.cpp             | 16 +++----
 core/src/ldml/ldml_transforms.hpp             | 10 ++---
 core/src/ldml/ldml_vkeys.cpp                  |  4 +-
 core/src/ldml/ldml_vkeys.hpp                  |  4 +-
 core/src/mock/mock_processor.cpp              |  6 +--
 core/src/mock/mock_processor.hpp              |  6 +--
 core/src/option.cpp                           |  4 +-
 core/src/option.hpp                           |  4 +-
 core/src/path.hpp                             |  4 +-
 core/src/processor.hpp                        |  6 +--
 core/src/state.cpp                            |  4 +-
 core/src/state.hpp                            | 34 +++++++--------
 .../tests/kmx_test_source/kmx_test_source.cpp | 14 +++----
 .../tests/kmx_test_source/kmx_test_source.hpp |  2 +-
 core/tests/unit/kmnkbd/debug_api.cpp          |  4 +-
 core/tests/unit/kmnkbd/debug_items.hpp        |  2 +-
 core/tests/unit/kmnkbd/keyboard_api.cpp       |  2 +-
 core/tests/unit/kmnkbd/options_api.cpp        |  4 +-
 core/tests/unit/kmnkbd/state_api.cpp          |  2 +-
 core/tests/unit/kmnkbd/test_kmx_context.cpp   |  2 +-
 core/tests/unit/kmnkbd/test_kmx_xstring.cpp   |  2 +-
 core/tests/unit/kmx/kmx.cpp                   |  8 ++--
 core/tests/unit/kmx/kmx_external_event.cpp    |  8 ++--
 core/tests/unit/kmx/kmx_imx.cpp               | 12 +++---
 core/tests/unit/kmx/kmx_key_list.cpp          |  6 +--
 core/tests/unit/ldml/keyboards/meson.build    |  2 +-
 core/tests/unit/ldml/ldml.cpp                 |  8 ++--
 core/tests/unit/ldml/ldml_test_source.cpp     | 42 +++++++++----------
 core/tests/unit/ldml/ldml_test_source.hpp     |  8 ++--
 core/tests/unit/ldml/ldml_test_utils.cpp      |  2 +-
 core/tests/unit/ldml/meson.build              |  2 +-
 core/tests/unit/ldml/test_kmx_plus.cpp        |  6 +--
 core/tests/unit/ldml/test_transforms.cpp      |  6 +--
 linux/ibus-keyman/tests/testfixture.cpp       |  4 +-
 74 files changed, 246 insertions(+), 246 deletions(-)

diff --git a/common/include/kmx_file.h b/common/include/kmx_file.h
index fb071ef4e5f..7dbc2261d0d 100644
--- a/common/include/kmx_file.h
+++ b/common/include/kmx_file.h
@@ -28,7 +28,7 @@ typedef KMX_WORD  __attribute__((aligned(1))) KMX_WORD_unaligned;
 #ifdef KM_CORE_LIBRARY
 // TODO: move this to a common namespace keyman::common::kmx_file or similar in the future
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 #endif
 
@@ -404,6 +404,6 @@ static_assert(sizeof(COMP_KEYBOARD) == KEYBOARDFILEHEADER_SIZE, "COMP_KEYBOARD m
 
 #ifdef KM_CORE_LIBRARY
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
 #endif
diff --git a/core/meson.build b/core/meson.build
index 6f5429a7b1a..12f66f32ab0 100644
--- a/core/meson.build
+++ b/core/meson.build
@@ -25,7 +25,7 @@ py = import('python')
 python = py.find_installation()
 
 # TODO: Shared includes may use namespaces, etc which need future tidyup.
-# For now, we use KM_CORE_LIBRARY to inject the km::kbp::kmx namespace
+# For now, we use KM_CORE_LIBRARY to inject the km::core::kmx namespace
 defns += ['-DKM_CORE_LIBRARY']
 
 # #define DEBUG when we are on a debug build
diff --git a/core/src/context.hpp b/core/src/context.hpp
index 08edc861634..dba7bec0608 100644
--- a/core/src/context.hpp
+++ b/core/src/context.hpp
@@ -15,7 +15,7 @@
 class json;
 
 namespace km {
-namespace kbp
+namespace core
 {
 
 // This will likely be replaced with a class implementing a more space
@@ -39,13 +39,13 @@ void context::push_marker(uint32_t marker) {
   emplace_back(km_core_context_item { KM_CORE_CT_MARKER, {0,}, {marker} });
 }
 
-} // namespace kbp
+} // namespace core
 } // namespace km
 
-json & operator << (json &, km::kbp::context const &);
+json & operator << (json &, km::core::context const &);
 json & operator << (json &, km_core_context_item const &);
 
 
-struct km_core_context : public km::kbp::context
+struct km_core_context : public km::core::context
 {
 };
diff --git a/core/src/debug.hpp b/core/src/debug.hpp
index 935fad155ca..a68d9f1e578 100644
--- a/core/src/debug.hpp
+++ b/core/src/debug.hpp
@@ -13,7 +13,7 @@
 #include <keyman/keyman_core_api_debug.h>
 
 namespace km {
-namespace kbp
+namespace core
 {
 
 class debug_items : public std::vector<km_core_state_debug_item>
@@ -66,6 +66,6 @@ void debug_items::set_enabled(bool value) noexcept {
   _is_enabled = value;
 }
 
-} // namespace kbp
+} // namespace core
 } // namespace km
 
diff --git a/core/src/debuglog.cpp b/core/src/debuglog.cpp
index 9519f3d3bc1..a4f8847892c 100644
--- a/core/src/debuglog.cpp
+++ b/core/src/debuglog.cpp
@@ -9,7 +9,7 @@
 #include "debuglog.h"
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 #define TAB "\t"
diff --git a/core/src/debuglog.h b/core/src/debuglog.h
index 1ecbaca6124..d8e3dc9473f 100644
--- a/core/src/debuglog.h
+++ b/core/src/debuglog.h
@@ -3,7 +3,7 @@
 #include <keyman/keyman_core_api_bits.h>
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 extern KMX_BOOL g_debug_ToConsole, g_debug_KeymanLog, g_silent;
@@ -17,11 +17,11 @@ extern const struct modifier_names s_modifier_names[];
 extern const char *s_key_names[];
 
 #ifdef _MSC_VER
-#define DebugLog(msg,...) (km::kbp::kmx::ShouldDebug() ? km::kbp::kmx::DebugLog_1(__FILE__, __LINE__, __FUNCTION__, (msg),__VA_ARGS__) : 0)
+#define DebugLog(msg,...) (km::core::kmx::ShouldDebug() ? km::core::kmx::DebugLog_1(__FILE__, __LINE__, __FUNCTION__, (msg),__VA_ARGS__) : 0)
 #define console_error(msg,...) write_console(TRUE, (msg), __VA_ARGS__)
 #define console_log(msg,...) write_console(FALSE, (msg), __VA_ARGS__)
 #else
-#define DebugLog(msg,...) (km::kbp::kmx::ShouldDebug() ? km::kbp::kmx::DebugLog_1(__FILE__, __LINE__, __FUNCTION__, (msg), ##__VA_ARGS__) : 0)
+#define DebugLog(msg,...) (km::core::kmx::ShouldDebug() ? km::core::kmx::DebugLog_1(__FILE__, __LINE__, __FUNCTION__, (msg), ##__VA_ARGS__) : 0)
 #define console_error(msg,...) write_console(TRUE, (msg), ##__VA_ARGS__)
 #define console_log(msg,...) write_console(FALSE, (msg), ##__VA_ARGS__)
 #endif
diff --git a/core/src/keyboard.cpp b/core/src/keyboard.cpp
index 47693b9b664..2c3a0c11b2c 100644
--- a/core/src/keyboard.cpp
+++ b/core/src/keyboard.cpp
@@ -8,7 +8,7 @@
 #include "keyboard.hpp"
 #include "jsonpp.hpp"
 
-using namespace km::kbp;
+using namespace km::core;
 
 
 inline
@@ -54,7 +54,7 @@ keyboard_attributes & keyboard_attributes::operator = (keyboard_attributes &&rhs
 }
 
 
-json & km::kbp::operator << (json & j, km::kbp::keyboard_attributes const & kb)
+json & km::core::operator << (json & j, km::core::keyboard_attributes const & kb)
 {
   j << json::object
       << "id" << kb.id
diff --git a/core/src/keyboard.hpp b/core/src/keyboard.hpp
index 97329b7e761..6dd8517ce10 100644
--- a/core/src/keyboard.hpp
+++ b/core/src/keyboard.hpp
@@ -20,13 +20,13 @@
 class json;
 
 namespace km {
-namespace kbp
+namespace core
 {
   class keyboard_attributes : public km_core_keyboard_attrs
   {
     std::u16string      _keyboard_id;
     std::u16string      _version_string;
-    kbp::path           _folder_path;
+    core::path           _folder_path;
     std::vector<option> _default_opts;
 
     void render();
@@ -48,7 +48,7 @@ namespace kbp
     keyboard_attributes & operator = (keyboard_attributes const &) = delete;
     keyboard_attributes & operator = (keyboard_attributes &&);
 
-    friend json & operator << (json &, km::kbp::keyboard_attributes const &);
+    friend json & operator << (json &, km::core::keyboard_attributes const &);
 
     options_store const &   default_opts_store() const noexcept { return _default_opts; }
     options_store &         default_opts_store() noexcept { return _default_opts; }
@@ -56,7 +56,7 @@ namespace kbp
     path_type const     &   path() const noexcept { return _folder_path; }
   };
 
-  json & operator << (json &, km::kbp::keyboard_attributes const &);
+  json & operator << (json &, km::core::keyboard_attributes const &);
 
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/km_core_context_api.cpp b/core/src/km_core_context_api.cpp
index 3655af4e964..2bebcf97d06 100644
--- a/core/src/km_core_context_api.cpp
+++ b/core/src/km_core_context_api.cpp
@@ -252,7 +252,7 @@ km_core_context_item_list_size(km_core_context_item const *context_items)
   return n;
 }
 
-json & operator << (json & j, km::kbp::context const & ctxt) {
+json & operator << (json & j, km::core::context const & ctxt) {
   j << json::array;
   for (auto & i: ctxt)  j << i;
   return j << json::close;
diff --git a/core/src/km_core_debug_api.cpp b/core/src/km_core_debug_api.cpp
index df324c222e6..2c6433a522c 100644
--- a/core/src/km_core_debug_api.cpp
+++ b/core/src/km_core_debug_api.cpp
@@ -13,7 +13,7 @@
 #include "processor.hpp"
 #include "state.hpp"
 
-using namespace km::kbp;
+using namespace km::core;
 
 km_core_status
 km_core_state_debug_set(
diff --git a/core/src/km_core_keyboard_api.cpp b/core/src/km_core_keyboard_api.cpp
index 632a2beb28d..ae825ca4025 100644
--- a/core/src/km_core_keyboard_api.cpp
+++ b/core/src/km_core_keyboard_api.cpp
@@ -18,7 +18,7 @@
 #include "ldml/ldml_processor.hpp"
 #include "mock/mock_processor.hpp"
 
-using namespace km::kbp;
+using namespace km::core;
 
 namespace
 {
diff --git a/core/src/km_core_state_api.cpp b/core/src/km_core_state_api.cpp
index 62080108aaf..e5ccccd795b 100644
--- a/core/src/km_core_state_api.cpp
+++ b/core/src/km_core_state_api.cpp
@@ -18,7 +18,7 @@
 #include "processor.hpp"
 #include "state.hpp"
 
-using namespace km::kbp;
+using namespace km::core;
 
 // Forward declarations
 class context;
diff --git a/core/src/kmx/kmx_actions.cpp b/core/src/kmx/kmx_actions.cpp
index dabf8f429a1..4e3f613357f 100644
--- a/core/src/kmx/kmx_actions.cpp
+++ b/core/src/kmx/kmx_actions.cpp
@@ -4,7 +4,7 @@
 */
 #include <kmx/kmx_processevent.h>
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 void KMX_Actions::ResetQueue()
diff --git a/core/src/kmx/kmx_actions.h b/core/src/kmx/kmx_actions.h
index 9caceb5f80f..b536a3018a0 100644
--- a/core/src/kmx/kmx_actions.h
+++ b/core/src/kmx/kmx_actions.h
@@ -8,7 +8,7 @@
 #include "kmx_base.h"
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 #define MAXACTIONQUEUE  1024
@@ -59,6 +59,6 @@ class KMX_Actions
 };
 
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
 
diff --git a/core/src/kmx/kmx_base.h b/core/src/kmx/kmx_base.h
index 77cf53c209b..fed03bc6450 100644
--- a/core/src/kmx/kmx_base.h
+++ b/core/src/kmx/kmx_base.h
@@ -11,7 +11,7 @@
 #endif
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 typedef struct tagSTORE
@@ -95,5 +95,5 @@ typedef struct tagKMSTATE
 enum ProcessStringReturn { psrPostMessages, psrCheckMatches };
 
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/kmx/kmx_capslock.cpp b/core/src/kmx/kmx_capslock.cpp
index f14745bf326..c304f4ddd3d 100644
--- a/core/src/kmx/kmx_capslock.cpp
+++ b/core/src/kmx/kmx_capslock.cpp
@@ -5,7 +5,7 @@
 #include <keyman/keyman_core_api_consts.h>
 #include <kmx/kmx_processevent.h>
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 /**
diff --git a/core/src/kmx/kmx_consts.cpp b/core/src/kmx/kmx_consts.cpp
index a0e1ff660ab..009ef1a4433 100644
--- a/core/src/kmx/kmx_consts.cpp
+++ b/core/src/kmx/kmx_consts.cpp
@@ -2,7 +2,7 @@
 #include "kmx_processevent.h"
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 const struct char_to_vkey s_char_to_vkey[] = {
@@ -105,5 +105,5 @@ const struct char_to_vkey s_char_to_vkey[] = {
 };
 
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/kmx/kmx_context.cpp b/core/src/kmx/kmx_context.cpp
index 6d8c9e4db95..2a0a0ab6148 100644
--- a/core/src/kmx/kmx_context.cpp
+++ b/core/src/kmx/kmx_context.cpp
@@ -4,7 +4,7 @@
 */
 #include <kmx/kmx_processevent.h>
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 /* KMX_Context */
diff --git a/core/src/kmx/kmx_context.h b/core/src/kmx/kmx_context.h
index 48c2897427d..58d27dd5761 100644
--- a/core/src/kmx/kmx_context.h
+++ b/core/src/kmx/kmx_context.h
@@ -10,7 +10,7 @@
 #define MAXCONTEXT 64
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 class KMX_Context
@@ -118,5 +118,5 @@ class KMX_Context
 };
 
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/kmx/kmx_conversion.cpp b/core/src/kmx/kmx_conversion.cpp
index c893fbfb41f..a3367b0414e 100644
--- a/core/src/kmx/kmx_conversion.cpp
+++ b/core/src/kmx/kmx_conversion.cpp
@@ -3,7 +3,7 @@
 
 #include "kmx_processevent.h"
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 /* This array is lifted from preservedkeymap.cpp */
@@ -116,7 +116,7 @@ const struct
 };
 
 
-KMX_BOOL km::kbp::kmx::MapUSCharToVK(KMX_WORD ch, PKMX_WORD puKey, PKMX_DWORD puShiftFlags) {
+KMX_BOOL km::core::kmx::MapUSCharToVK(KMX_WORD ch, PKMX_WORD puKey, PKMX_DWORD puShiftFlags) {
   assert(puKey != NULL);
   assert(puShiftFlags != NULL);
   if (ch >= 0x20 && ch < 0x7F) {
diff --git a/core/src/kmx/kmx_conversion.h b/core/src/kmx/kmx_conversion.h
index dacfa58e276..803033e100b 100644
--- a/core/src/kmx/kmx_conversion.h
+++ b/core/src/kmx/kmx_conversion.h
@@ -3,7 +3,7 @@
 #include "kmx_base.h"
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 #define VK_SPACE  0x20
@@ -32,5 +32,5 @@ namespace kmx {
 KMX_BOOL MapUSCharToVK(KMX_WORD ch, PKMX_WORD puKey, PKMX_DWORD puShiftFlags);
 
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/kmx/kmx_debugger.cpp b/core/src/kmx/kmx_debugger.cpp
index 84280280deb..374175a6507 100644
--- a/core/src/kmx/kmx_debugger.cpp
+++ b/core/src/kmx/kmx_debugger.cpp
@@ -8,7 +8,7 @@
 
 #include <kmx/kmx_processevent.h>
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 void KMX_DebugItems::push_item(
@@ -93,4 +93,4 @@ void KMX_DebugItems::fill_store_offsets(km_core_state_debug_kmx_info *info, PKMX
   }
 
   info->store_offsets[n] = 0xFFFF;
-}
\ No newline at end of file
+}
diff --git a/core/src/kmx/kmx_debugger.h b/core/src/kmx/kmx_debugger.h
index 45b9b8d3110..8678c21ae98 100644
--- a/core/src/kmx/kmx_debugger.h
+++ b/core/src/kmx/kmx_debugger.h
@@ -14,7 +14,7 @@
 #include <debug.hpp>
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 class KMX_DebugItems
@@ -143,5 +143,5 @@ KMX_DebugItems::push_rule_exit(
 }
 
 } // namespace kmx
-} // namespace kbp
-} // namespace km
\ No newline at end of file
+} // namespace core
+} // namespace km
diff --git a/core/src/kmx/kmx_environment.cpp b/core/src/kmx/kmx_environment.cpp
index 5d6e367e141..1260f0f4be9 100644
--- a/core/src/kmx/kmx_environment.cpp
+++ b/core/src/kmx/kmx_environment.cpp
@@ -7,7 +7,7 @@
 #include <state.hpp>
 #include <option.hpp>
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 namespace {
diff --git a/core/src/kmx/kmx_environment.h b/core/src/kmx/kmx_environment.h
index d15b3c587bc..6202333b736 100644
--- a/core/src/kmx/kmx_environment.h
+++ b/core/src/kmx/kmx_environment.h
@@ -5,7 +5,7 @@
 #include "kmx_base.h"
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 class KMX_Environment {
@@ -30,5 +30,5 @@ class KMX_Environment {
 };
 
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/kmx/kmx_file.cpp b/core/src/kmx/kmx_file.cpp
index e06d9dbe6a7..8258c93b8a0 100644
--- a/core/src/kmx/kmx_file.cpp
+++ b/core/src/kmx/kmx_file.cpp
@@ -6,7 +6,7 @@
 #include <assert.h>
 #include "kmx_file_validator.hpp"
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 #if defined(_WIN32) || defined(_WIN64)
@@ -20,7 +20,7 @@ KMX_BOOL KMX_ProcessEvent::Load(km_core_path_name KeyboardName)
   return TRUE;
 }
 
-const int km::kbp::kmx::CODE__SIZE[] = {
+const int km::core::kmx::CODE__SIZE[] = {
     -1,  // undefined                0x00
     1,   // CODE_ANY                 0x01
     2,   // CODE_INDEX               0x02
diff --git a/core/src/kmx/kmx_file_validator.hpp b/core/src/kmx/kmx_file_validator.hpp
index 48b042ab1bf..af82959cd21 100644
--- a/core/src/kmx/kmx_file_validator.hpp
+++ b/core/src/kmx/kmx_file_validator.hpp
@@ -9,7 +9,7 @@
 #ifdef KM_CORE_LIBRARY
 // TODO: move this to a common namespace keyman::common::kmx_file or similar in the future
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 #endif
 
@@ -29,6 +29,6 @@ class KMX_FileValidator : public COMP_KEYBOARD {
 
 #ifdef KM_CORE_LIBRARY
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
 #endif
diff --git a/core/src/kmx/kmx_modifiers.cpp b/core/src/kmx/kmx_modifiers.cpp
index 0de3ce6ed87..a0173c9cdc2 100644
--- a/core/src/kmx/kmx_modifiers.cpp
+++ b/core/src/kmx/kmx_modifiers.cpp
@@ -4,7 +4,7 @@
 */
 #include "kmx_processevent.h"
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 #define MAX_RSHIFT 24
@@ -22,7 +22,7 @@ static KMX_DWORD legalRuleStates[MAX_RSHIFT] = {
 };
 
 // Simulate RALT -> LCtrl+RAlt -> columns marked with *
-// 
+//
 // Truth table: matching key states
 // 1 = yes match always
 // 2 = RAlt mapped as LCtrl+RAlt by keyboard driver
@@ -109,14 +109,14 @@ KMX_BOOL KMX_ProcessEvent::IsEquivalentShift(KMX_UINT rshift, KMX_UINT kshift) {
 
   for(i = 0; i < MAX_RSHIFT; i++) {
     if(rshift == legalRuleStates[i]) {
-      rshift = i; 
+      rshift = i;
       break;
     }
   }
   if(i == MAX_RSHIFT) return FALSE;
 
   for(i = 0; i < MAX_KSHIFT; i++) {
-    if(kshift == legalKeyStates[i]) { 
+    if(kshift == legalKeyStates[i]) {
       kshift = i;
       break;
     }
diff --git a/core/src/kmx/kmx_options.cpp b/core/src/kmx/kmx_options.cpp
index 98c8a539e52..6d844d18748 100644
--- a/core/src/kmx/kmx_options.cpp
+++ b/core/src/kmx/kmx_options.cpp
@@ -6,7 +6,7 @@
 #include "kmx_processevent.h"
 #include <option.hpp>
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 int KMX_Options::_GetIndex(std::u16string const &key) const {
diff --git a/core/src/kmx/kmx_options.h b/core/src/kmx/kmx_options.h
index 500dc7474ea..14c280e411c 100644
--- a/core/src/kmx/kmx_options.h
+++ b/core/src/kmx/kmx_options.h
@@ -11,7 +11,7 @@
 #include "kmx_debugger.h"
 
 namespace km {
-namespace kbp {
+namespace core {
 
 class abstract_processor;
 
@@ -68,5 +68,5 @@ STORE const * KMX_Options::end() const {
 }
 
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/kmx/kmx_plus.cpp b/core/src/kmx/kmx_plus.cpp
index a60b85927b5..49b60be642d 100644
--- a/core/src/kmx/kmx_plus.cpp
+++ b/core/src/kmx/kmx_plus.cpp
@@ -16,7 +16,7 @@
 #include "kmx_plus.h"
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 /**
@@ -381,7 +381,7 @@ COMP_KMXPLUS_ELEM_ELEMENT::loadAsStringList(KMX_DWORD length, const COMP_KMXPLUS
     if (o.type() == LDML_ELEM_FLAGS_TYPE_STR) {
       // fetch the string
       const auto str16 = strs.get(o.element);
-      str = km::kbp::kmx::u16string_to_u32string(str16);
+      str = km::core::kmx::u16string_to_u32string(str16);
     } else {
       // single char
       str = std::u32string(1, (km_core_usv)o.element);
@@ -1289,5 +1289,5 @@ const COMP_KMXPLUS_VARS_ITEM *COMP_KMXPLUS_VARS::findByStringId(KMX_DWORD strId)
 
 
 }  // namespace kmx
-}  // namespace kbp
+}  // namespace core
 }  // namespace km
diff --git a/core/src/kmx/kmx_plus.h b/core/src/kmx/kmx_plus.h
index 2c890b805eb..1f4c35aa0ae 100644
--- a/core/src/kmx/kmx_plus.h
+++ b/core/src/kmx/kmx_plus.h
@@ -15,7 +15,7 @@
 #include <deque>
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 /**
@@ -111,7 +111,7 @@ struct COMP_KMXPLUS_ELEM_ELEMENT {
    * @param length number of elements, including this one
    * @return the string elements as a string array
   */
-  std::deque<std::u32string> loadAsStringList(KMX_DWORD length, const km::kbp::kmx::COMP_KMXPLUS_STRS &strs) const;
+  std::deque<std::u32string> loadAsStringList(KMX_DWORD length, const km::core::kmx::COMP_KMXPLUS_STRS &strs) const;
 
   /** @return element type */
   KMX_DWORD type() const;
@@ -782,5 +782,5 @@ class kmx_plus {
 #endif
 
 }  // namespace kmx
-}  // namespace kbp
+}  // namespace core
 }  // namespace km
diff --git a/core/src/kmx/kmx_processevent.cpp b/core/src/kmx/kmx_processevent.cpp
index 389ec4aa615..8e07e963c0f 100644
--- a/core/src/kmx/kmx_processevent.cpp
+++ b/core/src/kmx/kmx_processevent.cpp
@@ -6,14 +6,14 @@
 #include "state.hpp"
 #include <keyman/keyman_core_api_consts.h>
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 /* Globals */
 
-KMX_BOOL km::kbp::kmx::g_debug_ToConsole = FALSE;
-KMX_BOOL km::kbp::kmx::g_debug_KeymanLog = TRUE;
-KMX_BOOL km::kbp::kmx::g_silent = FALSE;
+KMX_BOOL km::core::kmx::g_debug_ToConsole = FALSE;
+KMX_BOOL km::core::kmx::g_debug_KeymanLog = TRUE;
+KMX_BOOL km::core::kmx::g_silent = FALSE;
 
 /*
 * KMX_ProcessEvent
@@ -84,7 +84,7 @@ KMX_BOOL KMX_ProcessEvent::ProcessEvent(
 ) {
   LPKEYBOARD kbd = m_keyboard.Keyboard;
 
-  m_kbp_state = state;
+  m_core_state = state;
 
   // If debugging is enabled, then ...
   DeleteInternalDebugItems();
@@ -106,7 +106,7 @@ KMX_BOOL KMX_ProcessEvent::ProcessEvent(
 
   if (kbd->StartGroup[BEGIN_UNICODE] == (KMX_DWORD) -1) {
     DebugLog("Non-Unicode keyboards are not supported.");
-    m_kbp_state = nullptr;
+    m_core_state = nullptr;
     return FALSE;
   }
 
@@ -124,7 +124,7 @@ KMX_BOOL KMX_ProcessEvent::ProcessEvent(
   }
 
   if (!isKeyDown) {
-    m_kbp_state = nullptr;
+    m_core_state = nullptr;
     return FALSE;
   }
 
@@ -149,7 +149,7 @@ KMX_BOOL KMX_ProcessEvent::ProcessEvent(
     DeleteInternalDebugItems();
   }
 
-  m_kbp_state = nullptr;
+  m_core_state = nullptr;
 
   return !fOutputKeystroke;
 }
@@ -488,7 +488,7 @@ int KMX_ProcessEvent::PostString(PKMX_WCHAR str, LPKEYBOARD lpkb, PKMX_WCHAR end
 
       case CODE_CALL:
         p++;
-        m_kbp_state->imx_callback(*p-1);
+        m_core_state->imx_callback(*p-1);
         FoundUse = TRUE;
         break;
       case CODE_USE:          // use another group
@@ -519,7 +519,7 @@ int KMX_ProcessEvent::PostString(PKMX_WCHAR str, LPKEYBOARD lpkb, PKMX_WCHAR end
       case CODE_RESETOPT:
         p++;
         n1 = *p - 1;
-        GetOptions()->Reset(m_kbp_state->processor(), n1);
+        GetOptions()->Reset(m_core_state->processor(), n1);
         break;
       case CODE_SAVEOPT:
         p++;
@@ -792,8 +792,8 @@ PKMX_WCHAR KMX_ProcessEvent::GetSystemStore(LPKEYBOARD kb, KMX_DWORD SystemID)
 
 void KMX_ProcessEvent::CreateInternalDebugItems() {
   assert(m_debug_items == nullptr);
-  assert(m_kbp_state != nullptr);
-  m_debug_items = new KMX_DebugItems(&m_kbp_state->debug_items());
+  assert(m_core_state != nullptr);
+  m_debug_items = new KMX_DebugItems(&m_core_state->debug_items());
   m_options.SetInternalDebugItems(m_debug_items);
 }
 
diff --git a/core/src/kmx/kmx_processevent.h b/core/src/kmx/kmx_processevent.h
index 7beb3f777bf..50e84c996d8 100644
--- a/core/src/kmx/kmx_processevent.h
+++ b/core/src/kmx/kmx_processevent.h
@@ -27,7 +27,7 @@
 /***************************************************************************/
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 /* Utility */
@@ -40,7 +40,7 @@ class KMX_ProcessEvent {
   PKMX_WCHAR m_miniContext;
   int m_miniContextIfLen; // number of if() statements excluded from start of m_miniContext
   KMSTATE m_state;
-  km_core_state *m_kbp_state;
+  km_core_state *m_core_state;
 
 
   kmx::KMX_Actions m_actions;
@@ -127,5 +127,5 @@ struct char_to_vkey {
 extern const struct char_to_vkey s_char_to_vkey[];
 
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/kmx/kmx_processor.cpp b/core/src/kmx/kmx_processor.cpp
index b2bc0d69ab5..bb18db9edda 100644
--- a/core/src/kmx/kmx_processor.cpp
+++ b/core/src/kmx/kmx_processor.cpp
@@ -3,7 +3,7 @@
 #include "kmx/kmx_processor.hpp"
 #include <map>
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 // TODO consolodate with appint.cpp and put in public library.
@@ -38,7 +38,7 @@ km_core_status kmx_processor::validate() const {
   return _valid ? KM_CORE_STATUS_OK : KM_CORE_STATUS_INVALID_KEYBOARD;
 }
 
-kmx_processor::kmx_processor(kbp::path p) {
+kmx_processor::kmx_processor(core::path p) {
   p.replace_extension(".kmx");
   _valid = bool(_kmx.Load(p.c_str()));
 
@@ -283,8 +283,8 @@ kmx_processor::process_event(
     switch (c->type) {
     case KM_CORE_CT_CHAR:
       {
-        km::kbp::kmx::char16_single buf;
-        const int len = km::kbp::kmx::Utf32CharToUtf16(c->character, buf);
+        km::core::kmx::char16_single buf;
+        const int len = km::core::kmx::Utf32CharToUtf16(c->character, buf);
         ctxt.append(buf.ch, len);
       }
       break;
diff --git a/core/src/kmx/kmx_processor.hpp b/core/src/kmx/kmx_processor.hpp
index 690d51ef738..b83e8bba9ea 100644
--- a/core/src/kmx/kmx_processor.hpp
+++ b/core/src/kmx/kmx_processor.hpp
@@ -15,7 +15,7 @@
 #include "processor.hpp"
 
 namespace km {
-namespace kbp
+namespace core
 {
   class kmx_processor : public abstract_processor
   {
@@ -82,5 +82,5 @@ namespace kbp
 
   };
 
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/kmx/kmx_xstring.cpp b/core/src/kmx/kmx_xstring.cpp
index b3e199d0ad2..bd2b5481028 100644
--- a/core/src/kmx/kmx_xstring.cpp
+++ b/core/src/kmx/kmx_xstring.cpp
@@ -9,10 +9,10 @@
 #include "kmx_processevent.h"
 #include "utfcodec.hpp"
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
-const km_core_cp *km::kbp::kmx::u16chr(const km_core_cp *p, km_core_cp ch) {
+const km_core_cp *km::core::kmx::u16chr(const km_core_cp *p, km_core_cp ch) {
   while (*p) {
     if (*p == ch) return p;
     p++;
@@ -20,7 +20,7 @@ const km_core_cp *km::kbp::kmx::u16chr(const km_core_cp *p, km_core_cp ch) {
   return ch == 0 ? p : NULL;
 }
 
-const km_core_cp *km::kbp::kmx::u16cpy(km_core_cp *dst, const km_core_cp *src) {
+const km_core_cp *km::core::kmx::u16cpy(km_core_cp *dst, const km_core_cp *src) {
   km_core_cp *o = dst;
   while (*src) {
     *dst++ = *src++;
@@ -29,7 +29,7 @@ const km_core_cp *km::kbp::kmx::u16cpy(km_core_cp *dst, const km_core_cp *src) {
   return o;
 }
 
-const km_core_cp *km::kbp::kmx::u16ncpy(km_core_cp *dst, const km_core_cp *src, size_t max) {
+const km_core_cp *km::core::kmx::u16ncpy(km_core_cp *dst, const km_core_cp *src, size_t max) {
   km_core_cp *o = dst;
   while (*src && max > 0) {
     *dst++ = *src++;
@@ -42,7 +42,7 @@ const km_core_cp *km::kbp::kmx::u16ncpy(km_core_cp *dst, const km_core_cp *src,
   return o;
 }
 
-size_t km::kbp::kmx::u16len(const km_core_cp *p) {
+size_t km::core::kmx::u16len(const km_core_cp *p) {
   int i = 0;
   while (*p) {
     p++;
@@ -51,7 +51,7 @@ size_t km::kbp::kmx::u16len(const km_core_cp *p) {
   return i;
 }
 
-int km::kbp::kmx::u16cmp(const km_core_cp *p, const km_core_cp *q) {
+int km::core::kmx::u16cmp(const km_core_cp *p, const km_core_cp *q) {
   while (*p && *q) {
     if (*p != *q) return *p - *q;
     p++;
@@ -60,7 +60,7 @@ int km::kbp::kmx::u16cmp(const km_core_cp *p, const km_core_cp *q) {
   return *p - *q;
 }
 
-int km::kbp::kmx::u16icmp(const km_core_cp *p, const km_core_cp *q) {
+int km::core::kmx::u16icmp(const km_core_cp *p, const km_core_cp *q) {
   while (*p && *q) {
     if (toupper(*p) != toupper(*q)) return *p - *q;
     p++;
@@ -69,7 +69,7 @@ int km::kbp::kmx::u16icmp(const km_core_cp *p, const km_core_cp *q) {
   return *p - *q;
 }
 
-int km::kbp::kmx::u16ncmp(const km_core_cp *p, const km_core_cp *q, size_t count) {
+int km::core::kmx::u16ncmp(const km_core_cp *p, const km_core_cp *q, size_t count) {
   while (*p && *q && count) {
     if (*p != *q) return *p - *q;
     p++;
@@ -81,7 +81,7 @@ int km::kbp::kmx::u16ncmp(const km_core_cp *p, const km_core_cp *q, size_t count
   return 0;
 }
 
-km_core_cp *km::kbp::kmx::u16tok(km_core_cp *p, km_core_cp ch, km_core_cp **ctx) {
+km_core_cp *km::core::kmx::u16tok(km_core_cp *p, km_core_cp ch, km_core_cp **ctx) {
   if (!p) {
     p = *ctx;
     if (!p) return NULL;
@@ -103,7 +103,7 @@ km_core_cp *km::kbp::kmx::u16tok(km_core_cp *p, km_core_cp ch, km_core_cp **ctx)
   return p;
 }
 
-km_core_cp *km::kbp::kmx::u16dup(km_core_cp *src) {
+km_core_cp *km::core::kmx::u16dup(km_core_cp *src) {
   km_core_cp *dup = new km_core_cp[u16len(src) + 1];
   memcpy(dup, src, (u16len(src) + 1) * sizeof(km_core_cp));
   return dup;
@@ -120,7 +120,7 @@ km_core_cp *km::kbp::kmx::u16dup(km_core_cp *src) {
 *
 * xstrlen calculates the length of a string, ignoring some special chars.
 */
-PKMX_WCHAR km::kbp::kmx::incxstr(PKMX_WCHAR p) {
+PKMX_WCHAR km::core::kmx::incxstr(PKMX_WCHAR p) {
 
   if (*p == 0)
     return p;
@@ -154,7 +154,7 @@ PKMX_WCHAR km::kbp::kmx::incxstr(PKMX_WCHAR p) {
   return p;
 }
 
-PKMX_WCHAR km::kbp::kmx::decxstr(PKMX_WCHAR p, PKMX_WCHAR pStart)
+PKMX_WCHAR km::core::kmx::decxstr(PKMX_WCHAR p, PKMX_WCHAR pStart)
 {
   PKMX_WCHAR q;
 
@@ -197,7 +197,7 @@ PKMX_WCHAR km::kbp::kmx::decxstr(PKMX_WCHAR p, PKMX_WCHAR pStart)
   return p;
 }
 
-int km::kbp::kmx::xstrlen_ignoreifopt(PKMX_WCHAR p)
+int km::core::kmx::xstrlen_ignoreifopt(PKMX_WCHAR p)
 {
   int i;
   for(i = 0; *p; i++, p=incxstr(p))
@@ -207,21 +207,21 @@ int km::kbp::kmx::xstrlen_ignoreifopt(PKMX_WCHAR p)
   return i;
 }
 
-int km::kbp::kmx::xstrlen(PKMX_WCHAR p)
+int km::core::kmx::xstrlen(PKMX_WCHAR p)
 {
   int i;
   for(i = 0; *p; i++, p=incxstr(p));
   return i;
 }
 
-int km::kbp::kmx::xstrpos(PKMX_WCHAR p1, PKMX_WCHAR p)
+int km::core::kmx::xstrpos(PKMX_WCHAR p1, PKMX_WCHAR p)
 {
   int i;
   for(i = 0; p < p1; p = incxstr(p), i++);
   return i;
 }
 
-PKMX_WCHAR km::kbp::kmx::xstrchr(PKMX_WCHAR buf, PKMX_WCHAR chr)
+PKMX_WCHAR km::core::kmx::xstrchr(PKMX_WCHAR buf, PKMX_WCHAR chr)
 {
   for(PKMX_WCHAR q = incxstr(buf); *buf; buf = q, q = incxstr(buf))
     if(!u16ncmp(buf, chr, (intptr_t)(q-buf)))
@@ -229,14 +229,14 @@ PKMX_WCHAR km::kbp::kmx::xstrchr(PKMX_WCHAR buf, PKMX_WCHAR chr)
   return NULL;
 }
 
-int km::kbp::kmx::xchrcmp(PKMX_WCHAR ch1, PKMX_WCHAR ch2)
+int km::core::kmx::xchrcmp(PKMX_WCHAR ch1, PKMX_WCHAR ch2)
 {
   PKMX_WCHAR nch1 = incxstr(ch1);
   if(nch1 == ch1) return *ch2 - *ch1; /* comparing *ch2 to nul */
   return u16ncmp(ch1, ch2, (intptr_t)(nch1-ch1));
 }
 
-PKMX_WCHAR km::kbp::kmx::strtowstr(PKMX_CHAR in)
+PKMX_WCHAR km::core::kmx::strtowstr(PKMX_CHAR in)
 {
   PKMX_WCHAR result;
 
@@ -247,7 +247,7 @@ PKMX_WCHAR km::kbp::kmx::strtowstr(PKMX_CHAR in)
   return result;
 }
 
-PKMX_CHAR km::kbp::kmx::wstrtostr(PKMX_WCHAR in)
+PKMX_CHAR km::core::kmx::wstrtostr(PKMX_WCHAR in)
 {
   PKMX_CHAR result;
 
diff --git a/core/src/kmx/kmx_xstring.h b/core/src/kmx/kmx_xstring.h
index 880c8b662d8..e18a029ff6b 100644
--- a/core/src/kmx/kmx_xstring.h
+++ b/core/src/kmx/kmx_xstring.h
@@ -3,7 +3,7 @@
 #include "kmx_base.h"
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 const char16_t Uni_LEAD_SURROGATE_START  = 0xD800;
@@ -25,12 +25,12 @@ const km_core_usv Uni_MAX_CODEPOINT       = 0x10FFFF;
  * @brief True if a lead surrogate
  * \def Uni_IsSurrogate1
  */
-#define Uni_IsSurrogate1(ch) ((ch) >= km::kbp::kmx::Uni_LEAD_SURROGATE_START && (ch) <= km::kbp::kmx::Uni_LEAD_SURROGATE_END)
+#define Uni_IsSurrogate1(ch) ((ch) >= km::core::kmx::Uni_LEAD_SURROGATE_START && (ch) <= km::core::kmx::Uni_LEAD_SURROGATE_END)
 /**
  * @brief True if a trail surrogate
  * \def Uni_IsSurrogate2
  */
-#define Uni_IsSurrogate2(ch) ((ch) >= km::kbp::kmx::Uni_TRAIL_SURROGATE_START && (ch) <= km::kbp::kmx::Uni_TRAIL_SURROGATE_END)
+#define Uni_IsSurrogate2(ch) ((ch) >= km::core::kmx::Uni_TRAIL_SURROGATE_START && (ch) <= km::core::kmx::Uni_TRAIL_SURROGATE_END)
 
 /**
  * @brief True if any surrogate
@@ -42,7 +42,7 @@ const km_core_usv Uni_MAX_CODEPOINT       = 0x10FFFF;
  * @brief Returns true if BMP (Plane 0)
  * \def Uni_IsBMP
  */
-#define Uni_IsBMP(ch) ((ch) <=  km::kbp::kmx::Uni_BMP_END)
+#define Uni_IsBMP(ch) ((ch) <=  km::core::kmx::Uni_BMP_END)
 
 /**
  * @brief Convert two UTF-16 surrogates into one UTF-32 codepoint
@@ -50,7 +50,7 @@ const km_core_usv Uni_MAX_CODEPOINT       = 0x10FFFF;
  * @param cl trail surrogate - Uni_IsSurrogate2(cl) must == true
  * \def Uni_SurrogateToUTF
  */
-#define Uni_SurrogateToUTF32(ch, cl) (((ch) - km::kbp::kmx::Uni_LEAD_SURROGATE_START) * 0x400 + ((cl) - km::kbp::kmx::Uni_TRAIL_SURROGATE_START) + km::kbp::kmx::Uni_SMP_START)
+#define Uni_SurrogateToUTF32(ch, cl) (((ch) - km::core::kmx::Uni_LEAD_SURROGATE_START) * 0x400 + ((cl) - km::core::kmx::Uni_TRAIL_SURROGATE_START) + km::core::kmx::Uni_SMP_START)
 
 /**
  * @brief Convert UTF-32 BMP to UTF-16 BMP
@@ -59,8 +59,8 @@ const km_core_usv Uni_MAX_CODEPOINT       = 0x10FFFF;
  */
 #define Uni_UTF32BMPToUTF16(ch) ((ch) & Uni_FFFF_NONCHARACTER)
 
-#define Uni_UTF32ToSurrogate1(ch) (char16_t)(((ch) - km::kbp::kmx::Uni_SMP_START) / 0x400 + km::kbp::kmx::Uni_LEAD_SURROGATE_START)
-#define Uni_UTF32ToSurrogate2(ch) (char16_t)(((ch) - km::kbp::kmx::Uni_SMP_START) % 0x400 + km::kbp::kmx::Uni_TRAIL_SURROGATE_START)
+#define Uni_UTF32ToSurrogate1(ch) (char16_t)(((ch) - km::core::kmx::Uni_SMP_START) / 0x400 + km::core::kmx::Uni_LEAD_SURROGATE_START)
+#define Uni_UTF32ToSurrogate2(ch) (char16_t)(((ch) - km::core::kmx::Uni_SMP_START) % 0x400 + km::core::kmx::Uni_TRAIL_SURROGATE_START)
 
 /**
  * @returns true if the character is a noncharacter
@@ -224,5 +224,5 @@ inline bool Uni_IsValid(km_core_usv start, km_core_usv end) {
 
 
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/ldml/ldml_processor.cpp b/core/src/ldml/ldml_processor.cpp
index 40b263a3532..e58bc214bd0 100644
--- a/core/src/ldml/ldml_processor.cpp
+++ b/core/src/ldml/ldml_processor.cpp
@@ -27,10 +27,10 @@ namespace {
   };
 }
 
-// using km::kbp::kmx::ShouldDebug; // for DebugLog
+// using km::core::kmx::ShouldDebug; // for DebugLog
 
 namespace km {
-namespace kbp {
+namespace core {
 
 
 ldml_processor::ldml_processor(path const & kb_path, const std::vector<uint8_t> &data)
@@ -88,7 +88,7 @@ ldml_processor::ldml_processor(path const & kb_path, const std::vector<uint8_t>
 
   // load transforms
   if (kplus.tran != nullptr && kplus.tran->groupCount > 0) {
-    transforms.reset(km::kbp::ldml::transforms::load(kplus, kplus.tran, kplus.tranHelper));
+    transforms.reset(km::core::ldml::transforms::load(kplus, kplus.tran, kplus.tranHelper));
     if (!transforms) {
       DebugLog("Failed to load tran transforms");
       return; // failed to load
@@ -97,7 +97,7 @@ ldml_processor::ldml_processor(path const & kb_path, const std::vector<uint8_t>
 
   // load bksp transforms
   if (kplus.bksp != nullptr && kplus.bksp->groupCount > 0) {
-    bksp_transforms.reset(km::kbp::ldml::transforms::load(kplus, kplus.bksp, kplus.bkspHelper));
+    bksp_transforms.reset(km::core::ldml::transforms::load(kplus, kplus.bksp, kplus.bkspHelper));
     if (!bksp_transforms) {
       DebugLog("Failed to load bksp transforms");
       return; // failed to load
@@ -389,7 +389,7 @@ ldml_processor::emit_text(km_core_state *state, km_core_usv ch) {
 
 void
 ldml_processor::emit_marker(km_core_state *state, KMX_DWORD marker_no) {
-  assert(km::kbp::kmx::is_valid_marker(marker_no));
+  assert(km::core::kmx::is_valid_marker(marker_no));
   state->actions().push_marker(marker_no);
   state->context().push_marker(marker_no);
 }
@@ -405,7 +405,7 @@ ldml_processor::context_to_string(km_core_state *state, std::u32string &str) {
       if (last_type == KM_CORE_BT_CHAR) {
         str.insert(0, 1, c->character);
       } else if (last_type == KM_CORE_BT_MARKER) {
-        assert(km::kbp::kmx::is_valid_marker(c->marker));
+        assert(km::core::kmx::is_valid_marker(c->marker));
         prepend_marker(str, c->marker);
       } else {
         break;
@@ -415,5 +415,5 @@ ldml_processor::context_to_string(km_core_state *state, std::u32string &str) {
 }
 
 
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/ldml/ldml_processor.hpp b/core/src/ldml/ldml_processor.hpp
index e0129115b21..31fc48ff646 100644
--- a/core/src/ldml/ldml_processor.hpp
+++ b/core/src/ldml/ldml_processor.hpp
@@ -20,7 +20,7 @@
 #include "ldml_transforms.hpp"
 
 namespace km {
-namespace kbp {
+namespace core {
 
 #define KM_CORE_LMDL_PROCESSOR_VERSION u"1.0"
 
@@ -112,5 +112,5 @@ namespace kbp {
      str.insert(0, triple, 3);
   }
 
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/ldml/ldml_transforms.cpp b/core/src/ldml/ldml_transforms.cpp
index 5507c6ed86d..10ba6250e06 100644
--- a/core/src/ldml/ldml_transforms.cpp
+++ b/core/src/ldml/ldml_transforms.cpp
@@ -16,7 +16,7 @@
 #endif
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace ldml {
 
 /**
@@ -460,7 +460,7 @@ void
 transform_entry::init() {
   if (!fFrom.empty()) {
     // TODO-LDML: if we have mapFrom, may need to do other processing.
-    const std::u16string patstr = km::kbp::kmx::u32string_to_u16string(fFrom);
+    const std::u16string patstr = km::core::kmx::u32string_to_u16string(fFrom);
     UErrorCode status           = U_ZERO_ERROR;
     /* const */ icu::UnicodeString patustr = icu::UnicodeString(patstr.data(), (int32_t)patstr.length());
     // add '$' to match to end
@@ -476,7 +476,7 @@ transform_entry::apply(const std::u32string &input, std::u32string &output) cons
   // TODO-LDML: Really? can't go from u32 to UnicodeString?
   // TODO-LDML: Also, we could cache the u16 string at the transformGroup level or higher.
   UErrorCode status = U_ZERO_ERROR;
-  const std::u16string matchstr = km::kbp::kmx::u32string_to_u16string(input);
+  const std::u16string matchstr = km::core::kmx::u32string_to_u16string(input);
   icu::UnicodeString matchustr  = icu::UnicodeString(matchstr.data(), (int32_t)matchstr.length());
   // TODO-LDML: create a new Matcher every time. These could be cached and reset.
   std::unique_ptr<icu::RegexMatcher> matcher(fFromPattern->matcher(matchustr, status));
@@ -509,7 +509,7 @@ transform_entry::apply(const std::u32string &input, std::u32string &output) cons
     // Normal case: not a map.
     // This replace will apply $1, $2 etc.
     // Convert the fTo into u16 TODO-LDML (we could cache this?)
-    const std::u16string rstr = km::kbp::kmx::u32string_to_u16string(fTo);
+    const std::u16string rstr = km::core::kmx::u32string_to_u16string(fTo);
     rustr  = icu::UnicodeString(rstr.data(), (int32_t)rstr.length());
   } else {
     // Set map case: mapping from/to
@@ -539,7 +539,7 @@ transform_entry::apply(const std::u32string &input, std::u32string &output) cons
 
     // 2. get the target string, convert to utf-16
     // we use the same matchIndex that was just found
-    const std::u16string rstr = km::kbp::kmx::u32string_to_u16string(fMapToList.at(matchIndex));
+    const std::u16string rstr = km::core::kmx::u32string_to_u16string(fMapToList.at(matchIndex));
 
     // 3. update the UnicodeString for replacement
     rustr  = icu::UnicodeString(rstr.data(), (int32_t)rstr.length());
@@ -752,8 +752,8 @@ transforms::apply(std::u32string &str) {
 transforms *
 transforms::load(
     const kmx::kmx_plus &kplus,
-    const kbp::kmx::COMP_KMXPLUS_TRAN *tran,
-    const kbp::kmx::COMP_KMXPLUS_TRAN_Helper &tranHelper) {
+    const core::kmx::COMP_KMXPLUS_TRAN *tran,
+    const core::kmx::COMP_KMXPLUS_TRAN_Helper &tranHelper) {
   if (tran == nullptr) {
     DebugLog("for tran: tran is null");
     assert(false);
@@ -832,5 +832,5 @@ transforms::load(
 }
 
 }  // namespace ldml
-}  // namespace kbp
+}  // namespace core
 }  // namespace km
diff --git a/core/src/ldml/ldml_transforms.hpp b/core/src/ldml/ldml_transforms.hpp
index 9d231bfe323..d260423c331 100644
--- a/core/src/ldml/ldml_transforms.hpp
+++ b/core/src/ldml/ldml_transforms.hpp
@@ -27,10 +27,10 @@
 #include "unicode/utext.h"
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace ldml {
 
-using km::kbp::kmx::SimpleUSet;
+using km::core::kmx::SimpleUSet;
 
 /**
  * Type of a group
@@ -266,10 +266,10 @@ class transforms {
   /** load from a kmx_plus data section, either tran or bksp */
   static transforms *
   load(const kmx::kmx_plus &kplus,
-       const kbp::kmx::COMP_KMXPLUS_TRAN *tran,
-       const kbp::kmx::COMP_KMXPLUS_TRAN_Helper &tranHelper);
+       const core::kmx::COMP_KMXPLUS_TRAN *tran,
+       const core::kmx::COMP_KMXPLUS_TRAN_Helper &tranHelper);
 };
 
 }  // namespace ldml
-}  // namespace kbp
+}  // namespace core
 }  // namespace km
diff --git a/core/src/ldml/ldml_vkeys.cpp b/core/src/ldml/ldml_vkeys.cpp
index 9c52cb1f833..3d5123d709b 100644
--- a/core/src/ldml/ldml_vkeys.cpp
+++ b/core/src/ldml/ldml_vkeys.cpp
@@ -9,7 +9,7 @@
 #include "kmx_file.h"
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace ldml {
 
 vkeys::vkeys() : vkey_to_string() {
@@ -78,5 +78,5 @@ vkeys::lookup(const vkey_id& id) const {
 }
 
 }  // namespace ldml
-}  // namespace kbp
+}  // namespace core
 }  // namespace km
diff --git a/core/src/ldml/ldml_vkeys.hpp b/core/src/ldml/ldml_vkeys.hpp
index 7ee9dff2513..2b85138f406 100644
--- a/core/src/ldml/ldml_vkeys.hpp
+++ b/core/src/ldml/ldml_vkeys.hpp
@@ -16,7 +16,7 @@
 #include <keyman/keyman_core_api.h>
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace ldml {
 
 /**
@@ -55,5 +55,5 @@ class vkeys {
 };
 
 }  // namespace ldml
-}  // namespace kbp
+}  // namespace core
 }  // namespace km
diff --git a/core/src/mock/mock_processor.cpp b/core/src/mock/mock_processor.cpp
index f4466625108..d78ab5ef0e0 100644
--- a/core/src/mock/mock_processor.cpp
+++ b/core/src/mock/mock_processor.cpp
@@ -70,9 +70,9 @@ namespace
 }
 
 namespace km {
-  namespace kbp
+  namespace core
   {
-    mock_processor::mock_processor(kbp::path const & path)
+    mock_processor::mock_processor(core::path const & path)
     : abstract_processor(
         keyboard_attributes(path.stem(), u"3.145", path.parent(), {
           option{KM_CORE_OPT_KEYBOARD, u"__test_point", u"not tiggered"},
@@ -228,5 +228,5 @@ namespace km {
     km_core_status mock_processor::validate() const { return KM_CORE_STATUS_OK; }
 
     km_core_status null_processor::validate() const { return KM_CORE_STATUS_INVALID_ARGUMENT; }
-  } // namespace kbp
+  } // namespace core
 } // namespace km
diff --git a/core/src/mock/mock_processor.hpp b/core/src/mock/mock_processor.hpp
index eef96b352a3..b10f4ad8d27 100644
--- a/core/src/mock/mock_processor.hpp
+++ b/core/src/mock/mock_processor.hpp
@@ -16,14 +16,14 @@
 #include "option.hpp"
 
 namespace km {
-namespace kbp
+namespace core
 {
   class mock_processor : public abstract_processor
   {
     std::unordered_map<std::u16string, std::u16string> _options;
 
   public:
-    mock_processor(km::kbp::path const &);
+    mock_processor(km::core::path const &);
 //    ~mock_processor() override;
 
     km_core_status
@@ -76,5 +76,5 @@ namespace kbp
 
     km_core_status validate() const override;
   };
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/option.cpp b/core/src/option.cpp
index 556fb7135b2..dd9242ef0a1 100644
--- a/core/src/option.cpp
+++ b/core/src/option.cpp
@@ -12,7 +12,7 @@
 #include "processor.hpp"
 
 
-using namespace km::kbp;
+using namespace km::core;
 
 namespace
 {
@@ -44,7 +44,7 @@ option::option(km_core_option_scope s, char16_t const *k, char16_t const *v)
 }
 
 // TODO: Relocate this and fix it
-json & km::kbp::operator << (json &j, abstract_processor const &)
+json & km::core::operator << (json &j, abstract_processor const &)
 {
   j << json::object;
   // auto n = 0;
diff --git a/core/src/option.hpp b/core/src/option.hpp
index 7f450f504f3..cbfbf764365 100644
--- a/core/src/option.hpp
+++ b/core/src/option.hpp
@@ -18,7 +18,7 @@
 class json;
 
 namespace km {
-namespace kbp
+namespace core
 {
   struct option : public km_core_option_item
   {
@@ -89,5 +89,5 @@ namespace kbp
 
 
 
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/path.hpp b/core/src/path.hpp
index 00b76ef5601..be6ae61422a 100644
--- a/core/src/path.hpp
+++ b/core/src/path.hpp
@@ -19,7 +19,7 @@
 // Forward declarations
 
 namespace km {
-namespace kbp
+namespace core
 {
   class path
   {
@@ -157,5 +157,5 @@ namespace kbp
     return os;
   }
 
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/processor.hpp b/core/src/processor.hpp
index 717dc36a7bd..2dd52e82d48 100644
--- a/core/src/processor.hpp
+++ b/core/src/processor.hpp
@@ -16,7 +16,7 @@
 #include "keyboard.hpp"
 
 namespace km {
-namespace kbp
+namespace core
 {
   class abstract_processor
   {
@@ -127,7 +127,7 @@ namespace kbp
 
   json & operator << (json &j, abstract_processor const &opts);
 
-} // namespace kbp
+} // namespace core
 } // namespace km
 
-struct km_core_keyboard : public km::kbp::abstract_processor {};
+struct km_core_keyboard : public km::core::abstract_processor {};
diff --git a/core/src/state.cpp b/core/src/state.cpp
index 9893ca9e2b4..4a9c293a3dd 100644
--- a/core/src/state.cpp
+++ b/core/src/state.cpp
@@ -9,7 +9,7 @@
 #include "processor.hpp"
 #include <keyman/keyman_core_api_consts.h>
 
-using namespace km::kbp;
+using namespace km::core;
 
 void actions::push_persist(option const &opt) {
   assert(empty() || back().type != KM_CORE_IT_END);
@@ -35,7 +35,7 @@ void actions::push_capslock(bool turnOn) {
 }
 
 
-state::state(km::kbp::abstract_processor & ap, km_core_option_item const *env)
+state::state(km::core::abstract_processor & ap, km_core_option_item const *env)
   : _processor(ap)
 {
   for (; env && env->key != nullptr; env++) {
diff --git a/core/src/state.hpp b/core/src/state.hpp
index 04bb294931f..7543cdf94ed 100644
--- a/core/src/state.hpp
+++ b/core/src/state.hpp
@@ -18,7 +18,7 @@
 #include "debug.hpp"
 
 namespace km {
-namespace kbp
+namespace core
 {
 //Forward declarations
 class abstract_processor;
@@ -122,30 +122,30 @@ void actions::clear() {
 class state
 {
 protected:
-    kbp::context              _ctxt;
-    kbp::abstract_processor & _processor;
-    kbp::actions              _actions;
-    kbp::debug_items          _debug_items;
+    core::context              _ctxt;
+    core::abstract_processor & _processor;
+    core::actions              _actions;
+    core::debug_items          _debug_items;
     km_core_keyboard_imx_platform _imx_callback;
     void *_imx_object;
 
 public:
-    state(kbp::abstract_processor & kb, km_core_option_item const *env);
+    state(core::abstract_processor & kb, km_core_option_item const *env);
 
     state(state const &) = default;
     state(state const &&) = delete;
 
-    kbp::context       &  context() noexcept            { return _ctxt; }
-    kbp::context const &  context() const noexcept      { return _ctxt; }
+    core::context       &  context() noexcept            { return _ctxt; }
+    core::context const &  context() const noexcept      { return _ctxt; }
 
-    kbp::abstract_processor const & processor() const noexcept { return _processor; }
-    kbp::abstract_processor &       processor() noexcept { return _processor; }
+    core::abstract_processor const & processor() const noexcept { return _processor; }
+    core::abstract_processor &       processor() noexcept { return _processor; }
 
-    kbp::actions        & actions() noexcept        { return _actions; }
-    kbp::actions const  & actions() const noexcept  { return _actions; }
+    core::actions        & actions() noexcept        { return _actions; }
+    core::actions const  & actions() const noexcept  { return _actions; }
 
-    kbp::debug_items        & debug_items() noexcept        { return _debug_items; }
-    kbp::debug_items const  & debug_items() const noexcept  { return _debug_items; }
+    core::debug_items        & debug_items() noexcept        { return _debug_items; }
+    core::debug_items const  & debug_items() const noexcept  { return _debug_items; }
 
     void imx_register_callback(km_core_keyboard_imx_platform imx_callback, void *callback_object);
 
@@ -154,12 +154,12 @@ class state
     void imx_callback(uint32_t imx_id);
 };
 
-} // namespace kbp
+} // namespace core
 } // namespace km
 
-struct km_core_state : public km::kbp::state
+struct km_core_state : public km::core::state
 {
   template<typename... Args>
-  km_core_state(Args&&... args) : km::kbp::state(std::forward<Args>(args)...)
+  km_core_state(Args&&... args) : km::core::state(std::forward<Args>(args)...)
   {}
 };
diff --git a/core/tests/kmx_test_source/kmx_test_source.cpp b/core/tests/kmx_test_source/kmx_test_source.cpp
index 7bdf874e14c..f506fde062d 100644
--- a/core/tests/kmx_test_source/kmx_test_source.cpp
+++ b/core/tests/kmx_test_source/kmx_test_source.cpp
@@ -107,7 +107,7 @@ KmxTestSource::is_token(const std::string token, std::string &line) {
 
 int
 KmxTestSource::load_source(
-    const km::kbp::path &path,
+    const km::core::path &path,
     std::string &keys,
     std::u16string &expected,
     std::u16string &context,
@@ -210,15 +210,15 @@ key_event
 KmxTestSource::char_to_event(char ch) {
   assert(ch >= 32);
   return {
-      km::kbp::kmx::s_char_to_vkey[(int)ch - 32].vk,
-      (uint16_t)(km::kbp::kmx::s_char_to_vkey[(int)ch - 32].shifted ? KM_CORE_MODIFIER_SHIFT : 0)};
+      km::core::kmx::s_char_to_vkey[(int)ch - 32].vk,
+      (uint16_t)(km::core::kmx::s_char_to_vkey[(int)ch - 32].shifted ? KM_CORE_MODIFIER_SHIFT : 0)};
 }
 
 uint16_t
 KmxTestSource::get_modifier(std::string const m) {
-  for (int i = 0; km::kbp::kmx::s_modifier_names[i].name; i++) {
-    if (m == km::kbp::kmx::s_modifier_names[i].name) {
-      return km::kbp::kmx::s_modifier_names[i].modifier;
+  for (int i = 0; km::core::kmx::s_modifier_names[i].name; i++) {
+    if (m == km::core::kmx::s_modifier_names[i].name) {
+      return km::core::kmx::s_modifier_names[i].modifier;
     }
   }
   return 0;
@@ -227,7 +227,7 @@ KmxTestSource::get_modifier(std::string const m) {
 km_core_virtual_key
 KmxTestSource::get_vk(std::string const &vk) {
   for (int i = 1; i < 256; i++) {
-    if (vk == km::kbp::kmx::s_key_names[i]) {
+    if (vk == km::core::kmx::s_key_names[i]) {
       return i;
     }
   }
diff --git a/core/tests/kmx_test_source/kmx_test_source.hpp b/core/tests/kmx_test_source/kmx_test_source.hpp
index f0033e81461..bd7f19b5866 100644
--- a/core/tests/kmx_test_source/kmx_test_source.hpp
+++ b/core/tests/kmx_test_source/kmx_test_source.hpp
@@ -25,7 +25,7 @@ class KmxTestSource {
   KmxTestSource();
 
   int load_source(
-      const km::kbp::path &path,
+      const km::core::path &path,
       std::string &keys,
       std::u16string &expected,
       std::u16string &context,
diff --git a/core/tests/unit/kmnkbd/debug_api.cpp b/core/tests/unit/kmnkbd/debug_api.cpp
index b23aaf5176a..6763bd339a1 100644
--- a/core/tests/unit/kmnkbd/debug_api.cpp
+++ b/core/tests/unit/kmnkbd/debug_api.cpp
@@ -21,7 +21,7 @@
 #include <test_assert.h>
 #include "../emscripten_filesystem.h"
 
-using namespace km::kbp::kmx;
+using namespace km::core::kmx;
 
 km_core_option_item test_env_opts[] =
 {
@@ -51,7 +51,7 @@ void teardown() {
 void setup(const char *keyboard) {
   teardown();
 
-  km::kbp::path path = km::kbp::path::join(arg_path, keyboard);
+  km::core::path path = km::core::path::join(arg_path, keyboard);
 
   try_status(km_core_keyboard_load(path.native().c_str(), &test_kb));
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
diff --git a/core/tests/unit/kmnkbd/debug_items.hpp b/core/tests/unit/kmnkbd/debug_items.hpp
index 1848251975c..400f499bd2c 100644
--- a/core/tests/unit/kmnkbd/debug_items.hpp
+++ b/core/tests/unit/kmnkbd/debug_items.hpp
@@ -6,7 +6,7 @@
 
 #include <test_assert.h>
 
-using namespace km::kbp::kmx;
+using namespace km::core::kmx;
 
 namespace {
 
diff --git a/core/tests/unit/kmnkbd/keyboard_api.cpp b/core/tests/unit/kmnkbd/keyboard_api.cpp
index dab6a9df64e..95365e901cb 100644
--- a/core/tests/unit/kmnkbd/keyboard_api.cpp
+++ b/core/tests/unit/kmnkbd/keyboard_api.cpp
@@ -13,7 +13,7 @@
 
 namespace
 {
-  km::kbp::path const test_kb_path = "/a/dummy/keyboard.mock";
+  km::core::path const test_kb_path = "/a/dummy/keyboard.mock";
 }
 
 #define   try_status(expr) \
diff --git a/core/tests/unit/kmnkbd/options_api.cpp b/core/tests/unit/kmnkbd/options_api.cpp
index e4cf73bb94d..a831180f411 100644
--- a/core/tests/unit/kmnkbd/options_api.cpp
+++ b/core/tests/unit/kmnkbd/options_api.cpp
@@ -61,8 +61,8 @@ namespace
   };
 
 #if 0
-  km::kbp::state mock_state(test_kb, test_env);
-  km::kbp::state empty_state(empty_options_list, empty_options_list);
+  km::core::state mock_state(test_kb, test_env);
+  km::core::state empty_state(empty_options_list, empty_options_list);
 
 
   std::string get_json_doc(km_core_state * const state)
diff --git a/core/tests/unit/kmnkbd/state_api.cpp b/core/tests/unit/kmnkbd/state_api.cpp
index a228996127e..eec539e6e56 100644
--- a/core/tests/unit/kmnkbd/state_api.cpp
+++ b/core/tests/unit/kmnkbd/state_api.cpp
@@ -112,7 +112,7 @@ int main(int argc, char * argv[])
   km_core_keyboard * test_kb = nullptr;
   km_core_state * test_state = nullptr,
                * test_clone = nullptr;
-  try_status(km_core_keyboard_load(km::kbp::path("dummy.mock").c_str(), &test_kb));
+  try_status(km_core_keyboard_load(km::core::path("dummy.mock").c_str(), &test_kb));
 
   // Simple sanity tests.
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
diff --git a/core/tests/unit/kmnkbd/test_kmx_context.cpp b/core/tests/unit/kmnkbd/test_kmx_context.cpp
index 1023d1611e3..e557daeb3cb 100644
--- a/core/tests/unit/kmnkbd/test_kmx_context.cpp
+++ b/core/tests/unit/kmnkbd/test_kmx_context.cpp
@@ -15,7 +15,7 @@
 #include "../../../src/kmx/kmx_xstring.h"
 #include <test_assert.h>
 
-using namespace km::kbp::kmx;
+using namespace km::core::kmx;
 using namespace std;
 
 void
diff --git a/core/tests/unit/kmnkbd/test_kmx_xstring.cpp b/core/tests/unit/kmnkbd/test_kmx_xstring.cpp
index a1bda608b1a..157a744ae72 100644
--- a/core/tests/unit/kmnkbd/test_kmx_xstring.cpp
+++ b/core/tests/unit/kmnkbd/test_kmx_xstring.cpp
@@ -21,7 +21,7 @@
 #include <kmx_file.h>
 #include <test_assert.h>
 
-using namespace km::kbp::kmx;
+using namespace km::core::kmx;
 using namespace std;
 
 #define U_1F609_WINKING_FACE u"\U0001F609"
diff --git a/core/tests/unit/kmx/kmx.cpp b/core/tests/unit/kmx/kmx.cpp
index 7a832e014e2..cf1105d3f3b 100644
--- a/core/tests/unit/kmx/kmx.cpp
+++ b/core/tests/unit/kmx/kmx.cpp
@@ -80,8 +80,8 @@ apply_action(
         },
         {act.character}});
     {
-      km::kbp::kmx::char16_single buf;
-      const int len = km::kbp::kmx::Utf32CharToUtf16(act.character, buf);
+      km::core::kmx::char16_single buf;
+      const int len = km::core::kmx::Utf32CharToUtf16(act.character, buf);
       for(int i=0; i<len; i++) {
         text_store.push_back(buf.ch[i]);
       }
@@ -163,7 +163,7 @@ apply_action(
 }
 
 int
-run_test(const km::kbp::path &source, const km::kbp::path &compiled) {
+run_test(const km::core::path &source, const km::core::path &compiled) {
   std::string keys = "";
   std::u16string expected = u"", context = u"";
   km::tests::kmx_options options;
@@ -334,7 +334,7 @@ int main(int argc, char *argv[]) {
   }
   console_color::enabled = console_color::isaterminal() || arg_color;
 
-  km::kbp::kmx::g_debug_ToConsole = TRUE;
+  km::core::kmx::g_debug_ToConsole = TRUE;
 
 #ifdef __EMSCRIPTEN__
   return run_test(get_wasm_file_path(argv[first_arg]), get_wasm_file_path(argv[first_arg + 1]));
diff --git a/core/tests/unit/kmx/kmx_external_event.cpp b/core/tests/unit/kmx/kmx_external_event.cpp
index 9b103eb43f8..9ebdccfc734 100644
--- a/core/tests/unit/kmx/kmx_external_event.cpp
+++ b/core/tests/unit/kmx/kmx_external_event.cpp
@@ -25,7 +25,7 @@
  * - km_core_event with the event KM_CORE_EVENT_KEYBOARD_ACTIVATED
  */
 
-using namespace km::kbp::kmx;
+using namespace km::core::kmx;
 
 km_core_option_item test_env_opts[] =
 {
@@ -37,12 +37,12 @@ int error_args() {
   return 1;
 }
 
-void test_external_event(const km::kbp::path &source_file){
+void test_external_event(const km::core::path &source_file){
 
   km_core_keyboard * test_kb = nullptr;
   km_core_state * test_state = nullptr;
 
-  km::kbp::path full_path = source_file;
+  km::core::path full_path = source_file;
 
   try_status(km_core_keyboard_load(full_path.native().c_str(), &test_kb));
 
@@ -79,7 +79,7 @@ int main(int argc, char *argv []) {
     }
   }
   console_color::enabled = console_color::isaterminal() || arg_color;
-  km::kbp::kmx::g_debug_ToConsole = TRUE;
+  km::core::kmx::g_debug_ToConsole = TRUE;
 
 #ifdef __EMSCRIPTEN__
   test_external_event(get_wasm_file_path(argv[first_arg]));
diff --git a/core/tests/unit/kmx/kmx_imx.cpp b/core/tests/unit/kmx/kmx_imx.cpp
index b330d58b1b5..1e523dbdac6 100644
--- a/core/tests/unit/kmx/kmx_imx.cpp
+++ b/core/tests/unit/kmx/kmx_imx.cpp
@@ -25,7 +25,7 @@
  *  get_intermediate_context
  */
 
-using namespace km::kbp::kmx;
+using namespace km::core::kmx;
 
 km_core_option_item test_env_opts[] =
 {
@@ -156,13 +156,13 @@ uint8_t test_imx_callback(km_core_state *state, uint32_t imx_id, void *callback_
 }
 }; // extern "C"
 
-void test_imx_list(const km::kbp::path &source_file){
+void test_imx_list(const km::core::path &source_file){
 
   km_core_keyboard * test_kb = nullptr;
   km_core_state * test_state = nullptr;
   km_core_keyboard_imx * kb_imx_list;
 
-  km::kbp::path full_path = source_file;
+  km::core::path full_path = source_file;
 
   try_status(km_core_keyboard_load(full_path.native().c_str(), &test_kb));
 
@@ -201,13 +201,13 @@ void test_imx_list(const km::kbp::path &source_file){
 // the kmx processor will add this items to its action queue.
 // Finally when the `process_event` call returns we verify the action
 // queue is as expected.
-void test_queue_actions (const km::kbp::path &source_keyboard) {
+void test_queue_actions (const km::core::path &source_keyboard) {
 
   km_core_keyboard * test_kb = nullptr;
   km_core_state * test_state = nullptr;
   km_core_keyboard_imx * kb_imx_list;
 
-  km::kbp::path full_path = source_keyboard;
+  km::core::path full_path = source_keyboard;
 
   try_status(km_core_keyboard_load(full_path.native().c_str(), &test_kb));
 
@@ -262,7 +262,7 @@ int main(int argc, char *argv []) {
     }
   }
   console_color::enabled = console_color::isaterminal() || arg_color;
-  km::kbp::kmx::g_debug_ToConsole = TRUE;
+  km::core::kmx::g_debug_ToConsole = TRUE;
 
 #ifdef __EMSCRIPTEN__
   test_imx_list(get_wasm_file_path(argv[first_arg]));
diff --git a/core/tests/unit/kmx/kmx_key_list.cpp b/core/tests/unit/kmx/kmx_key_list.cpp
index 186b9925be0..25f3e836a2b 100644
--- a/core/tests/unit/kmx/kmx_key_list.cpp
+++ b/core/tests/unit/kmx/kmx_key_list.cpp
@@ -16,7 +16,7 @@
 #include <test_color.h>
 #include "../emscripten_filesystem.h"
 
-using namespace km::kbp::kmx;
+using namespace km::core::kmx;
 
 km_core_option_item test_env_opts[] =
 {
@@ -48,13 +48,13 @@ std::map<std::pair<km_core_virtual_key,uint32_t>, uint32_t> kb_key_expected_key_
  *
  * @param source_file  Path to kmx keyboard file
  */
-void test_key_list(const km::kbp::path &source_file){
+void test_key_list(const km::core::path &source_file){
 
   km_core_keyboard * test_kb = nullptr;
   km_core_state * test_state = nullptr;
   km_core_keyboard_key * kb_key_list;
 
-  km::kbp::path full_path = source_file;
+  km::core::path full_path = source_file;
 
   try_status(km_core_keyboard_load(full_path.native().c_str(), &test_kb));
 
diff --git a/core/tests/unit/ldml/keyboards/meson.build b/core/tests/unit/ldml/keyboards/meson.build
index eea0b519ac6..8c1ccff573b 100644
--- a/core/tests/unit/ldml/keyboards/meson.build
+++ b/core/tests/unit/ldml/keyboards/meson.build
@@ -1,5 +1,5 @@
 # Copyright:    © SIL International.
-# Description:  Cross platform build script to compile kmkbpldml API unit tests.
+# Description:  Cross platform build script to compile kmcoreldml API unit tests.
 # Create Date:  5 Aug 2022
 # Authors:      Marc Durdin
 #
diff --git a/core/tests/unit/ldml/ldml.cpp b/core/tests/unit/ldml/ldml.cpp
index 31a4cded731..20dd4315765 100644
--- a/core/tests/unit/ldml/ldml.cpp
+++ b/core/tests/unit/ldml/ldml.cpp
@@ -77,8 +77,8 @@ apply_action(
         },
         {act.character}});
     {
-      km::kbp::kmx::char16_single buf;
-      const int len = km::kbp::kmx::Utf32CharToUtf16(act.character, buf);
+      km::core::kmx::char16_single buf;
+      const int len = km::core::kmx::Utf32CharToUtf16(act.character, buf);
       for(int i=0; i<len; i++) {
         text_store.push_back(buf.ch[i]);
       }
@@ -176,7 +176,7 @@ verify_context(std::u16string& text_store, km_core_state* &test_state, std::vect
 }
 
 int
-run_test(const km::kbp::path &source, const km::kbp::path &compiled, km::tests::LdmlTestSource& test_source) {
+run_test(const km::core::path &source, const km::core::path &compiled, km::tests::LdmlTestSource& test_source) {
   km_core_keyboard * test_kb = nullptr;
   km_core_state * test_state = nullptr;
 
@@ -294,7 +294,7 @@ run_test(const km::kbp::path &source, const km::kbp::path &compiled, km::tests::
 /**
  * Run all tests for this keyboard
  */
-int run_all_tests(const km::kbp::path &source, const km::kbp::path &compiled) {
+int run_all_tests(const km::core::path &source, const km::core::path &compiled) {
   std::cout << "source file   = " << source << std::endl
             << "compiled file = " << compiled << std::endl;
 
diff --git a/core/tests/unit/ldml/ldml_test_source.cpp b/core/tests/unit/ldml/ldml_test_source.cpp
index 1a5905d1db3..adec0b9bb17 100644
--- a/core/tests/unit/ldml/ldml_test_source.cpp
+++ b/core/tests/unit/ldml/ldml_test_source.cpp
@@ -211,7 +211,7 @@ LdmlEmbeddedTestSource::is_token(const std::string token, std::string &line) {
 }
 
 int
-LdmlEmbeddedTestSource::load_source( const km::kbp::path &path ) {
+LdmlEmbeddedTestSource::load_source( const km::core::path &path ) {
   const std::string s_keys = "@@keys: ";
   const std::string s_expected = "@@expected: ";
   const std::string s_context = "@@context: ";
@@ -290,15 +290,15 @@ key_event
 LdmlTestSource::char_to_event(char ch) {
   assert(ch >= 32);
   return {
-      km::kbp::kmx::s_char_to_vkey[(int)ch - 32].vk,
-      (uint16_t)(km::kbp::kmx::s_char_to_vkey[(int)ch - 32].shifted ? KM_CORE_MODIFIER_SHIFT : 0)};
+      km::core::kmx::s_char_to_vkey[(int)ch - 32].vk,
+      (uint16_t)(km::core::kmx::s_char_to_vkey[(int)ch - 32].shifted ? KM_CORE_MODIFIER_SHIFT : 0)};
 }
 
 uint16_t
 LdmlTestSource::get_modifier(std::string const m) {
-  for (int i = 0; km::kbp::kmx::s_modifier_names[i].name; i++) {
-    if (m == km::kbp::kmx::s_modifier_names[i].name) {
-      return km::kbp::kmx::s_modifier_names[i].modifier;
+  for (int i = 0; km::core::kmx::s_modifier_names[i].name; i++) {
+    if (m == km::core::kmx::s_modifier_names[i].name) {
+      return km::core::kmx::s_modifier_names[i].modifier;
     }
   }
   return 0;
@@ -380,7 +380,7 @@ LdmlEmbeddedTestSource::next_key(std::string &keys) {
 
 class LdmlJsonTestSource : public LdmlTestSource {
 public:
-  LdmlJsonTestSource(const std::string &path, km::kbp::kmx::kmx_plus *kmxplus);
+  LdmlJsonTestSource(const std::string &path, km::core::kmx::kmx_plus *kmxplus);
   virtual ~LdmlJsonTestSource();
   virtual const std::u16string &get_context() const;
   int load(const nlohmann::json &test);
@@ -394,14 +394,14 @@ class LdmlJsonTestSource : public LdmlTestSource {
    * Which action are we on?
   */
   std::size_t action_index = -1;
-  const km::kbp::kmx::kmx_plus *kmxplus;
+  const km::core::kmx::kmx_plus *kmxplus;
   /**
    * Helpers
   */
   void set_key_from_id(key_event& k, const std::u16string& id);
 };
 
-LdmlJsonTestSource::LdmlJsonTestSource(const std::string &path, km::kbp::kmx::kmx_plus *k)
+LdmlJsonTestSource::LdmlJsonTestSource(const std::string &path, km::core::kmx::kmx_plus *k)
 :path(path), kmxplus(k) {
 
 }
@@ -509,7 +509,7 @@ int LdmlJsonTestSource::load(const nlohmann::json &data) {
 #if defined(HAVE_ICU4C)
 class LdmlJsonRepertoireTestSource : public LdmlTestSource {
 public:
-  LdmlJsonRepertoireTestSource(const std::string &path, km::kbp::kmx::kmx_plus *kmxplus);
+  LdmlJsonRepertoireTestSource(const std::string &path, km::core::kmx::kmx_plus *kmxplus);
   virtual ~LdmlJsonRepertoireTestSource();
   virtual const std::u16string &get_context() const;
   int load(const nlohmann::json &test);
@@ -524,14 +524,14 @@ class LdmlJsonRepertoireTestSource : public LdmlTestSource {
   std::unique_ptr<icu::UnicodeSet> uset;
   std::unique_ptr<icu::UnicodeSetIterator> iterator;
   bool need_check = false; // set this after each char
-  const km::kbp::kmx::kmx_plus *kmxplus;
+  const km::core::kmx::kmx_plus *kmxplus;
   /**
    * Helpers
   */
   void set_key_from_id(key_event& k, const std::u16string& id);
 };
 
-LdmlJsonRepertoireTestSource::LdmlJsonRepertoireTestSource(const std::string &path, km::kbp::kmx::kmx_plus *k)
+LdmlJsonRepertoireTestSource::LdmlJsonRepertoireTestSource(const std::string &path, km::core::kmx::kmx_plus *k)
 :path(path), kmxplus(k){
 
 }
@@ -566,8 +566,8 @@ LdmlJsonRepertoireTestSource::next_action(ldml_action &fillin) {
   // as string for debugging.
   // const icu::UnicodeString& str = iterator->getString();
 
-  km::kbp::kmx::char16_single ch16;
-  std::size_t len = km::kbp::kmx::Utf32CharToUtf16(ch, ch16);
+  km::core::kmx::char16_single ch16;
+  std::size_t len = km::core::kmx::Utf32CharToUtf16(ch, ch16);
   std::u16string chstr = std::u16string(ch16.ch, len);
   // append to expected
   expected.append(chstr);
@@ -661,14 +661,14 @@ int LdmlJsonRepertoireTestSource::load(const nlohmann::json &data) {
 LdmlJsonTestSourceFactory::LdmlJsonTestSourceFactory() : test_map() {
 }
 
-km::kbp::path
-LdmlJsonTestSourceFactory::kmx_to_test_json(const km::kbp::path &kmx) {
-  km::kbp::path p = kmx;
+km::core::path
+LdmlJsonTestSourceFactory::kmx_to_test_json(const km::core::path &kmx) {
+  km::core::path p = kmx;
   p.replace_extension(TEST_JSON_SUFFIX);
   return p;
 }
 
-int LdmlJsonTestSourceFactory::load(const km::kbp::path &compiled, const km::kbp::path &path) {
+int LdmlJsonTestSourceFactory::load(const km::core::path &compiled, const km::core::path &path) {
   std::ifstream json_file(path.native());
   if (!json_file) {
     return -1; // no file
@@ -679,14 +679,14 @@ int LdmlJsonTestSourceFactory::load(const km::kbp::path &compiled, const km::kbp
   }
 
   // check and load the KMX (yes, once again)
-  if(!km::kbp::ldml_processor::is_kmxplus_file(compiled, rawdata)) {
+  if(!km::core::ldml_processor::is_kmxplus_file(compiled, rawdata)) {
     std::cerr << "Reading KMX for test purposes failed: " << compiled << std::endl;
     return __LINE__;
   }
 
-  auto comp_keyboard = (const km::kbp::kmx::COMP_KEYBOARD*)rawdata.data();
+  auto comp_keyboard = (const km::core::kmx::COMP_KEYBOARD*)rawdata.data();
   // initialize the kmxplus object with our copy
-  kmxplus.reset(new km::kbp::kmx::kmx_plus(comp_keyboard, rawdata.size()));
+  kmxplus.reset(new km::core::kmx::kmx_plus(comp_keyboard, rawdata.size()));
 
   if (!kmxplus->is_valid()) {
     std::cerr << "kmx_plus invalid" << std::endl;
diff --git a/core/tests/unit/ldml/ldml_test_source.hpp b/core/tests/unit/ldml/ldml_test_source.hpp
index f0770d96548..886b33442a6 100644
--- a/core/tests/unit/ldml/ldml_test_source.hpp
+++ b/core/tests/unit/ldml/ldml_test_source.hpp
@@ -81,16 +81,16 @@ class LdmlJsonTestSourceFactory {
      * @param compiled the KMX - for lookup
      * @param path the json
     */
-    int load(const km::kbp::path &compiled, const km::kbp::path &path);
+    int load(const km::core::path &compiled, const km::core::path &path);
 
-    static km::kbp::path kmx_to_test_json(const km::kbp::path& kmx);
+    static km::core::path kmx_to_test_json(const km::core::path& kmx);
 
     const JsonTestMap& get_tests() const;
   private:
     JsonTestMap test_map;
     // copy of the kbd data, for lookups
     std::vector<uint8_t> rawdata;
-    std::unique_ptr<km::kbp::kmx::kmx_plus> kmxplus;
+    std::unique_ptr<km::core::kmx::kmx_plus> kmxplus;
 };
 
 
@@ -102,7 +102,7 @@ class LdmlEmbeddedTestSource : public LdmlTestSource {
   /**
    * Load the test_source from comments in the .xml source
    */
-  int load_source(const km::kbp::path &path);
+  int load_source(const km::core::path &path);
 
   virtual km_core_status get_expected_load_status();
   virtual const std::u16string &get_context() const;
diff --git a/core/tests/unit/ldml/ldml_test_utils.cpp b/core/tests/unit/ldml/ldml_test_utils.cpp
index f12017f183b..4b676704c51 100644
--- a/core/tests/unit/ldml/ldml_test_utils.cpp
+++ b/core/tests/unit/ldml/ldml_test_utils.cpp
@@ -16,7 +16,7 @@ namespace tests {
 km_core_virtual_key
 get_vk(std::string const &vk) {
   for (int i = 1; i < 256; i++) {
-    if (vk == km::kbp::kmx::s_key_names[i]) {
+    if (vk == km::core::kmx::s_key_names[i]) {
       return i;
     }
   }
diff --git a/core/tests/unit/ldml/meson.build b/core/tests/unit/ldml/meson.build
index c02d64bf184..2416906473f 100644
--- a/core/tests/unit/ldml/meson.build
+++ b/core/tests/unit/ldml/meson.build
@@ -1,5 +1,5 @@
 # Copyright:    © SIL International.
-# Description:  Cross platform build script to compile kmkbpldml API unit tests.
+# Description:  Cross platform build script to compile kmcoreldml API unit tests.
 # Create Date:  5 Aug 2022
 # Authors:      Marc Durdin
 #
diff --git a/core/tests/unit/ldml/test_kmx_plus.cpp b/core/tests/unit/ldml/test_kmx_plus.cpp
index 7f158dd1c31..ce80c2bf2d7 100644
--- a/core/tests/unit/ldml/test_kmx_plus.cpp
+++ b/core/tests/unit/ldml/test_kmx_plus.cpp
@@ -9,7 +9,7 @@
 #include "utfcodec.hpp"
 
 
-using namespace km::kbp::kmx;
+using namespace km::core::kmx;
 
 int test_COMP_KMXPLUS_KEYS_KEY() {
   std::cout << "== " << __FUNCTION__ << std::endl;
@@ -61,11 +61,11 @@ int test_COMP_KMXPLUS_KEYS_KEY() {
 int test_ldml_vkeys() {
   std::cout << "== " << __FUNCTION__ << std::endl;
 
-  km::kbp::ldml::vkeys vk;
+  km::core::ldml::vkeys vk;
 
 #define ADD_VKEY(k, m) { \
   const char* str = k "-" #m ; \
-  PKMX_WCHAR wstr = km::kbp::kmx::strtowstr(const_cast<PKMX_CHAR>(str)); \
+  PKMX_WCHAR wstr = km::core::kmx::strtowstr(const_cast<PKMX_CHAR>(str)); \
   vk.add(km::tests::get_vk(k), m, wstr); \
   delete [] wstr; \
 }
diff --git a/core/tests/unit/ldml/test_transforms.cpp b/core/tests/unit/ldml/test_transforms.cpp
index 723c2b07bcf..cb0db12bfe4 100644
--- a/core/tests/unit/ldml/test_transforms.cpp
+++ b/core/tests/unit/ldml/test_transforms.cpp
@@ -28,10 +28,10 @@
 // needed for streaming operators
 #include "utfcodec.hpp"
 
-using namespace km::kbp::ldml;
-using namespace km::kbp::kmx;
+using namespace km::core::ldml;
+using namespace km::core::kmx;
 
-// using km::kbp::kmx::u16cmp;
+// using km::core::kmx::u16cmp;
 
 int
 test_transforms() {
diff --git a/linux/ibus-keyman/tests/testfixture.cpp b/linux/ibus-keyman/tests/testfixture.cpp
index cfc1530a75a..8ea476d9168 100644
--- a/linux/ibus-keyman/tests/testfixture.cpp
+++ b/linux/ibus-keyman/tests/testfixture.cpp
@@ -243,8 +243,8 @@ get_context_keys(std::u16string context) {
           G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, "We can only deal with ASCII characters in the context", utf8, "", "");
     }
     result.push_back(
-        {km::kbp::kmx::s_char_to_vkey[(int)utf8[0] - 32].vk,
-         (uint16_t)(km::kbp::kmx::s_char_to_vkey[(int)utf8[0] - 32].shifted ? KM_CORE_MODIFIER_SHIFT : 0)});
+        {km::core::kmx::s_char_to_vkey[(int)utf8[0] - 32].vk,
+         (uint16_t)(km::core::kmx::s_char_to_vkey[(int)utf8[0] - 32].shifted ? KM_CORE_MODIFIER_SHIFT : 0)});
   }
   return result;
 }

From 38e5d34459db04bd91d54d7321c22f10be87aea7 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 20 Oct 2023 17:28:37 +0200
Subject: [PATCH 2/2] chore(linux): Rename namespace

Missed a few occurrences that sneaked in after merging with latest master.
---
 core/tests/unit/ldml/ldml.cpp             | 4 ++--
 core/tests/unit/ldml/ldml_test_source.cpp | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/tests/unit/ldml/ldml.cpp b/core/tests/unit/ldml/ldml.cpp
index 5c2b53fb841..eaf764e18eb 100644
--- a/core/tests/unit/ldml/ldml.cpp
+++ b/core/tests/unit/ldml/ldml.cpp
@@ -437,8 +437,8 @@ int main(int argc, char *argv[]) {
   if ((argc - first_arg) < 2) {
     return error_args();
   }
-  const km::kbp::path ldml_file = argv[first_arg++];
-  const km::kbp::path kmx_file  = argv[first_arg++];
+  const km::core::path ldml_file = argv[first_arg++];
+  const km::core::path kmx_file  = argv[first_arg++];
 
   std::string filter; // default to 'all tests'
   if ((argc - first_arg) >= 1) {
diff --git a/core/tests/unit/ldml/ldml_test_source.cpp b/core/tests/unit/ldml/ldml_test_source.cpp
index 8c35ec51409..f74884d240e 100644
--- a/core/tests/unit/ldml/ldml_test_source.cpp
+++ b/core/tests/unit/ldml/ldml_test_source.cpp
@@ -472,7 +472,7 @@ LdmlJsonTestSource::next_action(ldml_action &fillin) {
   if (type == "check") {
     fillin.type   = LDML_ACTION_CHECK_EXPECTED;
     fillin.string = LdmlTestSource::parse_u8_source_string(result.get<std::string>());
-    assert(km::kbp::ldml::normalize_nfc(fillin.string));
+    assert(km::core::ldml::normalize_nfc(fillin.string));
     return;
   } else if (type == "keystroke") {
     fillin.type   = LDML_ACTION_KEY_EVENT;
@@ -483,7 +483,7 @@ LdmlJsonTestSource::next_action(ldml_action &fillin) {
   } else if (type == "emit") {
     fillin.type   = LDML_ACTION_EMIT_STRING;
     fillin.string = LdmlTestSource::parse_u8_source_string(to.get<std::string>());
-    assert(km::kbp::ldml::normalize_nfc(fillin.string));
+    assert(km::core::ldml::normalize_nfc(fillin.string));
     return;
   } else if (type == "backspace") {
     // backspace is handled as a key event
@@ -507,7 +507,7 @@ int LdmlJsonTestSource::load(const nlohmann::json &data) {
   this->data        = data;  // TODO-LDML
   auto startContext = data["/startContext/to"_json_pointer];
   context = LdmlTestSource::parse_u8_source_string(startContext);
-  assert(km::kbp::ldml::normalize_nfc(context));
+  assert(km::core::ldml::normalize_nfc(context));
   return 0;
 }