Rename JSON classes

CMakeLists.txt

@@ -67,18 +67,18 @@ set(SOURCE_FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/FileOutputStream.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/logging/Logger.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/logging/LogLevel.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONInteger.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONLong.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONString.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONFloat.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONDouble.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONBoolean.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJsonInteger.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJsonLong.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJsonString.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJsonFloat.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJsonDouble.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJsonBoolean.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/logic/StateMachine.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/logic/State.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/logic/StateConnection.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/logic/SerializableJSONStateConnection.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/logic/SerializableJSONState.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/logic/SerializableJSONStateMachine.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/logic/SerializableJsonStateConnection.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/logic/SerializableJsonState.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/logic/SerializableJsonStateMachine.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/xml/XMLAttribute.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/xml/XMLNode.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/base/Version.cpp
@@ -93,19 +93,19 @@ set(SOURCE_FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/event/Event.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/event/EventHandler.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/event/EventManager.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/event/SerializableJSONEvent.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/event/SerializableJsonEvent.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/kv/KVPair.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/kv/KVDocument.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/kv/KVParser.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/kv/KVReader.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/SerializableJSONFactory.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/boxing/SerializableJSONBooleanFactory.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/boxing/SerializableJSONDoubleFactory.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/boxing/SerializableJSONFloatFactory.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/boxing/SerializableJSONIntegerFactory.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/boxing/SerializableJSONLongFactory.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/boxing/SerializableJSONStringFactory.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/event/SerializableJSONEventFactory.cpp)
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/SerializableJsonFactory.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/boxing/SerializableJsonBooleanFactory.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/boxing/SerializableJsonDoubleFactory.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/boxing/SerializableJsonFloatFactory.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/boxing/SerializableJsonIntegerFactory.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/boxing/SerializableJsonLongFactory.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/boxing/SerializableJsonStringFactory.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/event/SerializableJsonEventFactory.cpp)
 
 if (${LS_STD_BUILD_WITH_TESTS})
     set(TEST_FILES
@@ -126,19 +126,19 @@ if (${LS_STD_BUILD_WITH_TESTS})
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/StorableFileTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/FileOutputStreamTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/logging/LoggerTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/JSONTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/boxing/SerializableJSONIntegerTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/boxing/SerializableJSONLongTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/boxing/SerializableJSONStringTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/boxing/SerializableJSONFloatTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/boxing/SerializableJSONDoubleTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/boxing/SerializableJSONBooleanTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/JsonTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/boxing/SerializableJsonIntegerTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/boxing/SerializableJsonLongTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/boxing/SerializableJsonStringTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/boxing/SerializableJsonFloatTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/boxing/SerializableJsonDoubleTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/boxing/SerializableJsonBooleanTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/logic/StateTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/logic/StateMachineTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/logic/StateConnectionTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/logic/SerializableJSONStateConnectionTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/logic/SerializableJSONStateTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/logic/SerializableJSONStateMachineTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/logic/SerializableJsonStateConnectionTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/logic/SerializableJsonStateTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/logic/SerializableJsonStateMachineTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/TestDataFactory.hpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/TestDataFactory.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/xml/XMLAttributeTest.cpp
@@ -160,19 +160,19 @@ if (${LS_STD_BUILD_WITH_TESTS})
             ${CMAKE_CURRENT_SOURCE_DIR}/test/classes/event/GossipNewsAgency.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/event/EventHandlerTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/event/EventManagerTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/event/SerializableJSONEventTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/event/SerializableJsonEventTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/kv/KVPairTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/kv/KVDocumentTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/kv/KVParserTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/kv/KVReaderTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/SerializableFactoryTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/boxing/SerializableJSONBooleanFactoryTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/boxing/SerializableJSONDoubleFactoryTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/boxing/SerializableJSONFloatFactoryTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/boxing/SerializableJSONIntegerFactoryTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/boxing/SerializableJSONLongFactoryTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/boxing/SerializableJSONStringFactoryTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/event/SerializableJSONEventFactoryTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/boxing/SerializableJsonBooleanFactoryTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/boxing/SerializableJsonDoubleFactoryTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/boxing/SerializableJsonFloatFactoryTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/boxing/SerializableJsonIntegerFactoryTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/boxing/SerializableJsonLongFactoryTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/boxing/SerializableJsonStringFactoryTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/event/SerializableJsonEventFactoryTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/classes/factory/SerializableTestFactory.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/exception/FileNotFoundExceptionTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/exception/FileOperationExceptionTest.cpp

include/ls_std/factory/serialization/json/SerializableJSONFactory.hpp → include/ls_std/factory/serialization/json/SerializableJsonFactory.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-24
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -18,12 +18,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONFactory : public ls_std::Class
+  class SerializableJsonFactory : public ls_std::Class
   {
     public:
 
-      SerializableJSONFactory();
-      ~SerializableJSONFactory() override = default;
+      SerializableJsonFactory();
+      ~SerializableJsonFactory() override = default;
 
       bool addFactory(const std::pair<std::string, std::shared_ptr<ls_std::IFactory>> &_factoryInsertion);
       std::shared_ptr<ls_std::Class> build(const std::string &_relatedObjectName);

include/ls_std/factory/serialization/json/boxing/SerializableJSONBooleanFactory.hpp → include/ls_std/factory/serialization/json/boxing/SerializableJsonBooleanFactory.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-23
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -15,12 +15,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONBooleanFactory : public ls_std::Class, public ls_std::IFactory
+  class SerializableJsonBooleanFactory : public ls_std::Class, public ls_std::IFactory
   {
     public:
 
-      SerializableJSONBooleanFactory();
-      ~SerializableJSONBooleanFactory() override = default;
+      SerializableJsonBooleanFactory();
+      ~SerializableJsonBooleanFactory() override = default;
 
       std::shared_ptr<ls_std::Class> build() override;
   };

include/ls_std/factory/serialization/json/boxing/SerializableJSONDoubleFactory.hpp → include/ls_std/factory/serialization/json/boxing/SerializableJsonDoubleFactory.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-24
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -15,12 +15,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONDoubleFactory : public ls_std::Class, public ls_std::IFactory
+  class SerializableJsonDoubleFactory : public ls_std::Class, public ls_std::IFactory
   {
     public:
 
-      SerializableJSONDoubleFactory();
-      ~SerializableJSONDoubleFactory() override = default;
+      SerializableJsonDoubleFactory();
+      ~SerializableJsonDoubleFactory() override = default;
 
       std::shared_ptr<ls_std::Class> build() override;
   };

include/ls_std/factory/serialization/json/boxing/SerializableJSONFloatFactory.hpp → include/ls_std/factory/serialization/json/boxing/SerializableJsonFloatFactory.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-24
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -15,12 +15,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONFloatFactory : public ls_std::Class, public ls_std::IFactory
+  class SerializableJsonFloatFactory : public ls_std::Class, public ls_std::IFactory
   {
     public:
 
-      SerializableJSONFloatFactory();
-      ~SerializableJSONFloatFactory() override = default;
+      SerializableJsonFloatFactory();
+      ~SerializableJsonFloatFactory() override = default;
 
       std::shared_ptr<ls_std::Class> build() override;
   };

include/ls_std/factory/serialization/json/boxing/SerializableJSONIntegerFactory.hpp → include/ls_std/factory/serialization/json/boxing/SerializableJsonIntegerFactory.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-24
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -15,12 +15,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONIntegerFactory : public ls_std::Class, public ls_std::IFactory
+  class SerializableJsonIntegerFactory : public ls_std::Class, public ls_std::IFactory
   {
     public:
 
-      SerializableJSONIntegerFactory();
-      ~SerializableJSONIntegerFactory() override = default;
+      SerializableJsonIntegerFactory();
+      ~SerializableJsonIntegerFactory() override = default;
 
       std::shared_ptr<ls_std::Class> build() override;
   };

include/ls_std/factory/serialization/json/boxing/SerializableJSONLongFactory.hpp → include/ls_std/factory/serialization/json/boxing/SerializableJsonLongFactory.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-24
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -15,12 +15,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONLongFactory : public ls_std::Class, public ls_std::IFactory
+  class SerializableJsonLongFactory : public ls_std::Class, public ls_std::IFactory
   {
     public:
 
-      SerializableJSONLongFactory();
-      ~SerializableJSONLongFactory() override = default;
+      SerializableJsonLongFactory();
+      ~SerializableJsonLongFactory() override = default;
 
       std::shared_ptr<ls_std::Class> build() override;
   };

include/ls_std/factory/serialization/json/boxing/SerializableJSONStringFactory.hpp → include/ls_std/factory/serialization/json/boxing/SerializableJsonStringFactory.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-24
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -15,12 +15,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONStringFactory : public ls_std::Class, public ls_std::IFactory
+  class SerializableJsonStringFactory : public ls_std::Class, public ls_std::IFactory
   {
     public:
 
-      SerializableJSONStringFactory();
-      ~SerializableJSONStringFactory() override = default;
+      SerializableJsonStringFactory();
+      ~SerializableJsonStringFactory() override = default;
 
       std::shared_ptr<ls_std::Class> build() override;
   };

include/ls_std/factory/serialization/json/event/SerializableJSONEventFactory.hpp → include/ls_std/factory/serialization/json/event/SerializableJsonEventFactory.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-30
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -15,12 +15,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONEventFactory : public ls_std::Class, public ls_std::IFactory
+  class SerializableJsonEventFactory : public ls_std::Class, public ls_std::IFactory
   {
     public:
 
-      SerializableJSONEventFactory();
-      ~SerializableJSONEventFactory() override = default;
+      SerializableJsonEventFactory();
+      ~SerializableJsonEventFactory() override = default;
 
       std::shared_ptr<ls_std::Class> build() override;
   };

include/ls_std/ls_std.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-10-29
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -65,16 +65,16 @@
 #include "logic/StateMachine.hpp"
 #include "logic/StateMachineTypes.hpp"
 
-#include "serialization/json/boxing/SerializableJSONBoolean.hpp"
-#include "serialization/json/boxing/SerializableJSONDouble.hpp"
-#include "serialization/json/boxing/SerializableJSONFloat.hpp"
-#include "serialization/json/boxing/SerializableJSONInteger.hpp"
-#include "serialization/json/boxing/SerializableJSONLong.hpp"
-#include "serialization/json/boxing/SerializableJSONString.hpp"
-#include "serialization/json/logic/SerializableJSONState.hpp"
-#include "serialization/json/logic/SerializableJSONStateConnection.hpp"
-#include "serialization/json/logic/SerializableJSONStateMachine.hpp"
-#include "serialization/json/event/SerializableJSONEvent.hpp"
+#include "serialization/json/boxing/SerializableJsonBoolean.hpp"
+#include "serialization/json/boxing/SerializableJsonDouble.hpp"
+#include "serialization/json/boxing/SerializableJsonFloat.hpp"
+#include "serialization/json/boxing/SerializableJsonInteger.hpp"
+#include "serialization/json/boxing/SerializableJsonLong.hpp"
+#include "serialization/json/boxing/SerializableJsonString.hpp"
+#include "serialization/json/logic/SerializableJsonState.hpp"
+#include "serialization/json/logic/SerializableJsonStateConnection.hpp"
+#include "serialization/json/logic/SerializableJsonStateMachine.hpp"
+#include "serialization/json/event/SerializableJsonEvent.hpp"
 #include "serialization/ISerializable.hpp"
 
 #include "time/Date.hpp"
@@ -93,13 +93,13 @@
 #include "event/EventManager.hpp"
 
 #include "factory/IFactory.hpp"
-#include "ls_std/factory/serialization/json/SerializableJSONFactory.hpp"
-#include "factory/serialization/json/boxing/SerializableJSONBooleanFactory.hpp"
-#include "factory/serialization/json/boxing/SerializableJSONDoubleFactory.hpp"
-#include "factory/serialization/json/boxing/SerializableJSONFloatFactory.hpp"
-#include "factory/serialization/json/boxing/SerializableJSONIntegerFactory.hpp"
-#include "factory/serialization/json/boxing/SerializableJSONLongFactory.hpp"
-#include "factory/serialization/json/boxing/SerializableJSONStringFactory.hpp"
-#include "factory/serialization/json/event/SerializableJSONEventFactory.hpp"
+#include "ls_std/factory/serialization/json/SerializableJsonFactory.hpp"
+#include "factory/serialization/json/boxing/SerializableJsonBooleanFactory.hpp"
+#include "factory/serialization/json/boxing/SerializableJsonDoubleFactory.hpp"
+#include "factory/serialization/json/boxing/SerializableJsonFloatFactory.hpp"
+#include "factory/serialization/json/boxing/SerializableJsonIntegerFactory.hpp"
+#include "factory/serialization/json/boxing/SerializableJsonLongFactory.hpp"
+#include "factory/serialization/json/boxing/SerializableJsonStringFactory.hpp"
+#include "factory/serialization/json/event/SerializableJsonEventFactory.hpp"
 
 #endif

include/ls_std/serialization/json/boxing/SerializableJSONBoolean.hpp → include/ls_std/serialization/json/boxing/SerializableJsonBoolean.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-04
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -18,12 +18,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONBoolean : public ls_std::Class, public ls_std::ISerializable
+  class SerializableJsonBoolean : public ls_std::Class, public ls_std::ISerializable
   {
     public:
 
-      explicit SerializableJSONBoolean(const std::shared_ptr<ls_std::Boolean> &_value);
-      ~SerializableJSONBoolean() override = default;
+      explicit SerializableJsonBoolean(const std::shared_ptr<ls_std::Boolean> &_value);
+      ~SerializableJsonBoolean() override = default;
 
       // implementation
 

include/ls_std/serialization/json/boxing/SerializableJSONDouble.hpp → include/ls_std/serialization/json/boxing/SerializableJsonDouble.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-04
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -18,12 +18,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONDouble : public ls_std::Class, public ls_std::ISerializable
+  class SerializableJsonDouble : public ls_std::Class, public ls_std::ISerializable
   {
     public:
 
-      explicit SerializableJSONDouble(const std::shared_ptr<ls_std::Double> &_value);
-      ~SerializableJSONDouble() override = default;
+      explicit SerializableJsonDouble(const std::shared_ptr<ls_std::Double> &_value);
+      ~SerializableJsonDouble() override = default;
 
       // implementation
 

include/ls_std/serialization/json/boxing/SerializableJSONFloat.hpp → include/ls_std/serialization/json/boxing/SerializableJsonFloat.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-04
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -18,12 +18,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONFloat : public ls_std::Class, public ls_std::ISerializable
+  class SerializableJsonFloat : public ls_std::Class, public ls_std::ISerializable
   {
     public:
 
-      explicit SerializableJSONFloat(const std::shared_ptr<ls_std::Float> &_value);
-      ~SerializableJSONFloat() override = default;
+      explicit SerializableJsonFloat(const std::shared_ptr<ls_std::Float> &_value);
+      ~SerializableJsonFloat() override = default;
 
       // implementation
 

include/ls_std/serialization/json/boxing/SerializableJSONInteger.hpp → include/ls_std/serialization/json/boxing/SerializableJsonInteger.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-21
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -17,12 +17,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONInteger : public ls_std::Class, public ls_std::ISerializable
+  class SerializableJsonInteger : public ls_std::Class, public ls_std::ISerializable
   {
     public:
 
-      explicit SerializableJSONInteger(const std::shared_ptr<ls_std::Integer> &_value);
-      ~SerializableJSONInteger() override = default;
+      explicit SerializableJsonInteger(const std::shared_ptr<ls_std::Integer> &_value);
+      ~SerializableJsonInteger() override = default;
 
       // implementation
 

include/ls_std/serialization/json/boxing/SerializableJSONLong.hpp → include/ls_std/serialization/json/boxing/SerializableJsonLong.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-25
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -17,12 +17,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONLong : public ls_std::Class, public ls_std::ISerializable
+  class SerializableJsonLong : public ls_std::Class, public ls_std::ISerializable
   {
     public:
 
-      explicit SerializableJSONLong(const std::shared_ptr<ls_std::Long> &_value);
-      ~SerializableJSONLong() override = default;
+      explicit SerializableJsonLong(const std::shared_ptr<ls_std::Long> &_value);
+      ~SerializableJsonLong() override = default;
 
       // implementation
 

include/ls_std/serialization/json/boxing/SerializableJSONString.hpp → include/ls_std/serialization/json/boxing/SerializableJsonString.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-30
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -17,12 +17,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONString : public ls_std::Class, public ls_std::ISerializable
+  class SerializableJsonString : public ls_std::Class, public ls_std::ISerializable
   {
     public:
 
-      explicit SerializableJSONString(const std::shared_ptr<ls_std::String> &_value);
-      ~SerializableJSONString() override = default;
+      explicit SerializableJsonString(const std::shared_ptr<ls_std::String> &_value);
+      ~SerializableJsonString() override = default;
 
       // implementation
 

include/ls_std/serialization/json/event/SerializableJSONEvent.hpp → include/ls_std/serialization/json/event/SerializableJsonEvent.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-07
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -18,12 +18,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONEvent : public ls_std::Class, public ls_std::ISerializable
+  class SerializableJsonEvent : public ls_std::Class, public ls_std::ISerializable
   {
     public:
 
-      explicit SerializableJSONEvent(const std::shared_ptr<ls_std::Event> &_value);
-      ~SerializableJSONEvent() override = default;
+      explicit SerializableJsonEvent(const std::shared_ptr<ls_std::Event> &_value);
+      ~SerializableJsonEvent() override = default;
 
       // implementation
 

include/ls_std/serialization/json/logic/SerializableJSONState.hpp → include/ls_std/serialization/json/logic/SerializableJsonState.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-15
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -18,12 +18,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONState : public ls_std::Class, public ls_std::ISerializable
+  class SerializableJsonState : public ls_std::Class, public ls_std::ISerializable
   {
     public:
 
-      explicit SerializableJSONState(const std::shared_ptr<ls_std::State> &_value);
-      ~SerializableJSONState() override = default;
+      explicit SerializableJsonState(const std::shared_ptr<ls_std::State> &_value);
+      ~SerializableJsonState() override = default;
 
       // implementation
 

include/ls_std/serialization/json/logic/SerializableJSONStateConnection.hpp → include/ls_std/serialization/json/logic/SerializableJsonStateConnection.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-14
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -18,12 +18,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONStateConnection : public ls_std::Class, public ls_std::ISerializable
+  class SerializableJsonStateConnection : public ls_std::Class, public ls_std::ISerializable
   {
     public:
 
-      explicit SerializableJSONStateConnection(const std::shared_ptr<ls_std::StateConnection> &_value);
-      ~SerializableJSONStateConnection() override = default;
+      explicit SerializableJsonStateConnection(const std::shared_ptr<ls_std::StateConnection> &_value);
+      ~SerializableJsonStateConnection() override = default;
 
       // implementation
 

include/ls_std/serialization/json/logic/SerializableJSONStateMachine.hpp → include/ls_std/serialization/json/logic/SerializableJsonStateMachine.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-17
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -18,12 +18,12 @@
 
 namespace ls_std
 {
-  class SerializableJSONStateMachine : public ls_std::Class, public ls_std::ISerializable
+  class SerializableJsonStateMachine : public ls_std::Class, public ls_std::ISerializable
   {
     public:
 
-      explicit SerializableJSONStateMachine(const std::shared_ptr<ls_std::StateMachine> &_value);
-      ~SerializableJSONStateMachine() override = default;
+      explicit SerializableJsonStateMachine(const std::shared_ptr<ls_std::StateMachine> &_value);
+      ~SerializableJsonStateMachine() override = default;
 
       // implementation
 

source/ls_std/factory/serialization/json/SerializableJSONFactory.cpp → source/ls_std/factory/serialization/json/SerializableJsonFactory.cpp

@@ -3,32 +3,32 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-24
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/factory/serialization/json/SerializableJSONFactory.hpp>
+#include <ls_std/factory/serialization/json/SerializableJsonFactory.hpp>
 #include <ls_std/boxing/Boolean.hpp>
 #include <ls_std/boxing/Double.hpp>
 #include <ls_std/boxing/Float.hpp>
 #include <ls_std/boxing/Integer.hpp>
 #include <ls_std/boxing/Long.hpp>
 #include <ls_std/boxing/String.hpp>
-#include <ls_std/factory/serialization/json/boxing/SerializableJSONBooleanFactory.hpp>
-#include <ls_std/factory/serialization/json/boxing/SerializableJSONDoubleFactory.hpp>
-#include <ls_std/factory/serialization/json/boxing/SerializableJSONFloatFactory.hpp>
-#include <ls_std/factory/serialization/json/boxing/SerializableJSONIntegerFactory.hpp>
-#include <ls_std/factory/serialization/json/boxing/SerializableJSONLongFactory.hpp>
-#include <ls_std/factory/serialization/json/boxing/SerializableJSONStringFactory.hpp>
+#include <ls_std/factory/serialization/json/boxing/SerializableJsonBooleanFactory.hpp>
+#include <ls_std/factory/serialization/json/boxing/SerializableJsonDoubleFactory.hpp>
+#include <ls_std/factory/serialization/json/boxing/SerializableJsonFloatFactory.hpp>
+#include <ls_std/factory/serialization/json/boxing/SerializableJsonIntegerFactory.hpp>
+#include <ls_std/factory/serialization/json/boxing/SerializableJsonLongFactory.hpp>
+#include <ls_std/factory/serialization/json/boxing/SerializableJsonStringFactory.hpp>
 #include <ls_std/exception/IllegalArgumentException.hpp>
 #include <ls_std/exception/NullPointerException.hpp>
 
-ls_std::SerializableJSONFactory::SerializableJSONFactory() : ls_std::Class("SerializableJSONFactory")
+ls_std::SerializableJsonFactory::SerializableJsonFactory() : ls_std::Class("SerializableJsonFactory")
 {
   this->_init();
 }
 
-bool ls_std::SerializableJSONFactory::addFactory(const std::pair<std::string, std::shared_ptr<ls_std::IFactory>> &_factoryInsertion)
+bool ls_std::SerializableJsonFactory::addFactory(const std::pair<std::string, std::shared_ptr<ls_std::IFactory>> &_factoryInsertion)
 {
   bool factoryAdded{};
 
@@ -50,7 +50,7 @@ bool ls_std::SerializableJSONFactory::addFactory(const std::pair<std::string, st
   return factoryAdded;
 }
 
-std::shared_ptr<ls_std::Class> ls_std::SerializableJSONFactory::build(const std::string &_relatedObjectName)
+std::shared_ptr<ls_std::Class> ls_std::SerializableJsonFactory::build(const std::string &_relatedObjectName)
 {
   std::shared_ptr<ls_std::Class> requestedBuiltObject{};
 
@@ -62,18 +62,18 @@ std::shared_ptr<ls_std::Class> ls_std::SerializableJSONFactory::build(const std:
   return requestedBuiltObject;
 }
 
-bool ls_std::SerializableJSONFactory::clear()
+bool ls_std::SerializableJsonFactory::clear()
 {
   this->factories.clear();
   return factories.empty();
 }
 
-bool ls_std::SerializableJSONFactory::hasFactory(const std::string &_relatedObjectName)
+bool ls_std::SerializableJsonFactory::hasFactory(const std::string &_relatedObjectName)
 {
   return this->_hasFactory(_relatedObjectName);
 }
 
-bool ls_std::SerializableJSONFactory::removeFactory(const std::string &_relatedObjectName)
+bool ls_std::SerializableJsonFactory::removeFactory(const std::string &_relatedObjectName)
 {
   bool wasRemoved{};
 
@@ -86,17 +86,17 @@ bool ls_std::SerializableJSONFactory::removeFactory(const std::string &_relatedO
   return wasRemoved;
 }
 
-bool ls_std::SerializableJSONFactory::_hasFactory(const std::string &_relatedObjectName)
+bool ls_std::SerializableJsonFactory::_hasFactory(const std::string &_relatedObjectName)
 {
   return this->factories.find(_relatedObjectName) != this->factories.end();
 }
 
-void ls_std::SerializableJSONFactory::_init()
+void ls_std::SerializableJsonFactory::_init()
 {
-  this->factories.insert({ls_std::Boolean{}.getClassName(), std::make_shared<ls_std::SerializableJSONBooleanFactory>()});
-  this->factories.insert({ls_std::Double{}.getClassName(), std::make_shared<ls_std::SerializableJSONDoubleFactory>()});
-  this->factories.insert({ls_std::Float{}.getClassName(), std::make_shared<ls_std::SerializableJSONFloatFactory>()});
-  this->factories.insert({ls_std::Integer{}.getClassName(), std::make_shared<ls_std::SerializableJSONIntegerFactory>()});
-  this->factories.insert({ls_std::Long{}.getClassName(), std::make_shared<ls_std::SerializableJSONLongFactory>()});
-  this->factories.insert({ls_std::String{}.getClassName(), std::make_shared<ls_std::SerializableJSONStringFactory>()});
+  this->factories.insert({ls_std::Boolean{}.getClassName(), std::make_shared<ls_std::SerializableJsonBooleanFactory>()});
+  this->factories.insert({ls_std::Double{}.getClassName(), std::make_shared<ls_std::SerializableJsonDoubleFactory>()});
+  this->factories.insert({ls_std::Float{}.getClassName(), std::make_shared<ls_std::SerializableJsonFloatFactory>()});
+  this->factories.insert({ls_std::Integer{}.getClassName(), std::make_shared<ls_std::SerializableJsonIntegerFactory>()});
+  this->factories.insert({ls_std::Long{}.getClassName(), std::make_shared<ls_std::SerializableJsonLongFactory>()});
+  this->factories.insert({ls_std::String{}.getClassName(), std::make_shared<ls_std::SerializableJsonStringFactory>()});
 }

source/ls_std/factory/serialization/json/boxing/SerializableJSONBooleanFactory.cpp → source/ls_std/factory/serialization/json/boxing/SerializableJsonBooleanFactory.cpp

@@ -3,21 +3,21 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-23
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/factory/serialization/json/boxing/SerializableJSONBooleanFactory.hpp>
+#include <ls_std/factory/serialization/json/boxing/SerializableJsonBooleanFactory.hpp>
 #include <ls_std/boxing/Boolean.hpp>
-#include <ls_std/serialization/json/boxing/SerializableJSONBoolean.hpp>
+#include <ls_std/serialization/json/boxing/SerializableJsonBoolean.hpp>
 
-ls_std::SerializableJSONBooleanFactory::SerializableJSONBooleanFactory() : ls_std::Class("SerializableJSONBooleanFactory")
+ls_std::SerializableJsonBooleanFactory::SerializableJsonBooleanFactory() : ls_std::Class("SerializableJsonBooleanFactory")
 {}
 
-std::shared_ptr<ls_std::Class> ls_std::SerializableJSONBooleanFactory::build()
+std::shared_ptr<ls_std::Class> ls_std::SerializableJsonBooleanFactory::build()
 {
   std::shared_ptr<ls_std::Boolean> requestedObject = std::make_shared<ls_std::Boolean>();
-  std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJSONBoolean>(requestedObject);
+  std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJsonBoolean>(requestedObject);
   requestedObject->setSerializable(serializable);
 
   return std::dynamic_pointer_cast<ls_std::Class>(requestedObject);

source/ls_std/factory/serialization/json/boxing/SerializableJSONDoubleFactory.cpp → source/ls_std/factory/serialization/json/boxing/SerializableJsonDoubleFactory.cpp

@@ -3,21 +3,21 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-24
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/factory/serialization/json/boxing/SerializableJSONDoubleFactory.hpp>
+#include <ls_std/factory/serialization/json/boxing/SerializableJsonDoubleFactory.hpp>
 #include <ls_std/boxing/Double.hpp>
-#include <ls_std/serialization/json/boxing/SerializableJSONDouble.hpp>
+#include <ls_std/serialization/json/boxing/SerializableJsonDouble.hpp>
 
-ls_std::SerializableJSONDoubleFactory::SerializableJSONDoubleFactory() : ls_std::Class("SerializableJSONDoubleFactory")
+ls_std::SerializableJsonDoubleFactory::SerializableJsonDoubleFactory() : ls_std::Class("SerializableJsonDoubleFactory")
 {}
 
-std::shared_ptr<ls_std::Class> ls_std::SerializableJSONDoubleFactory::build()
+std::shared_ptr<ls_std::Class> ls_std::SerializableJsonDoubleFactory::build()
 {
   std::shared_ptr<ls_std::Double> requestedObject = std::make_shared<ls_std::Double>();
-  std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJSONDouble>(requestedObject);
+  std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJsonDouble>(requestedObject);
   requestedObject->setSerializable(serializable);
 
   return std::dynamic_pointer_cast<ls_std::Class>(requestedObject);

source/ls_std/factory/serialization/json/boxing/SerializableJSONFloatFactory.cpp → source/ls_std/factory/serialization/json/boxing/SerializableJsonFloatFactory.cpp

@@ -3,21 +3,21 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-25
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/factory/serialization/json/boxing/SerializableJSONFloatFactory.hpp>
+#include <ls_std/factory/serialization/json/boxing/SerializableJsonFloatFactory.hpp>
 #include <ls_std/boxing/Float.hpp>
-#include <ls_std/serialization/json/boxing/SerializableJSONFloat.hpp>
+#include <ls_std/serialization/json/boxing/SerializableJsonFloat.hpp>
 
-ls_std::SerializableJSONFloatFactory::SerializableJSONFloatFactory() : ls_std::Class("SerializableJSONFloatFactory")
+ls_std::SerializableJsonFloatFactory::SerializableJsonFloatFactory() : ls_std::Class("SerializableJsonFloatFactory")
 {}
 
-std::shared_ptr<ls_std::Class> ls_std::SerializableJSONFloatFactory::build()
+std::shared_ptr<ls_std::Class> ls_std::SerializableJsonFloatFactory::build()
 {
   std::shared_ptr<ls_std::Float> requestedObject = std::make_shared<ls_std::Float>();
-  std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJSONFloat>(requestedObject);
+  std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJsonFloat>(requestedObject);
   requestedObject->setSerializable(serializable);
 
   return std::dynamic_pointer_cast<ls_std::Class>(requestedObject);

source/ls_std/factory/serialization/json/boxing/SerializableJSONIntegerFactory.cpp → source/ls_std/factory/serialization/json/boxing/SerializableJsonIntegerFactory.cpp

@@ -3,21 +3,21 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-25
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/factory/serialization/json/boxing/SerializableJSONIntegerFactory.hpp>
+#include <ls_std/factory/serialization/json/boxing/SerializableJsonIntegerFactory.hpp>
 #include <ls_std/boxing/Integer.hpp>
-#include <ls_std/serialization/json/boxing/SerializableJSONInteger.hpp>
+#include <ls_std/serialization/json/boxing/SerializableJsonInteger.hpp>
 
-ls_std::SerializableJSONIntegerFactory::SerializableJSONIntegerFactory() : ls_std::Class("SerializableJSONIntegerFactory")
+ls_std::SerializableJsonIntegerFactory::SerializableJsonIntegerFactory() : ls_std::Class("SerializableJsonIntegerFactory")
 {}
 
-std::shared_ptr<ls_std::Class> ls_std::SerializableJSONIntegerFactory::build()
+std::shared_ptr<ls_std::Class> ls_std::SerializableJsonIntegerFactory::build()
 {
   std::shared_ptr<ls_std::Integer> requestedObject = std::make_shared<ls_std::Integer>();
-  std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJSONInteger>(requestedObject);
+  std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJsonInteger>(requestedObject);
   requestedObject->setSerializable(serializable);
 
   return std::dynamic_pointer_cast<ls_std::Class>(requestedObject);

source/ls_std/factory/serialization/json/boxing/SerializableJSONLongFactory.cpp → source/ls_std/factory/serialization/json/boxing/SerializableJsonLongFactory.cpp

@@ -3,21 +3,21 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-25
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/factory/serialization/json/boxing/SerializableJSONLongFactory.hpp>
+#include <ls_std/factory/serialization/json/boxing/SerializableJsonLongFactory.hpp>
 #include <ls_std/boxing/Long.hpp>
-#include <ls_std/serialization/json/boxing/SerializableJSONLong.hpp>
+#include <ls_std/serialization/json/boxing/SerializableJsonLong.hpp>
 
-ls_std::SerializableJSONLongFactory::SerializableJSONLongFactory() : ls_std::Class("SerializableJSONLongFactory")
+ls_std::SerializableJsonLongFactory::SerializableJsonLongFactory() : ls_std::Class("SerializableJsonLongFactory")
 {}
 
-std::shared_ptr<ls_std::Class> ls_std::SerializableJSONLongFactory::build()
+std::shared_ptr<ls_std::Class> ls_std::SerializableJsonLongFactory::build()
 {
   std::shared_ptr<ls_std::Long> requestedObject = std::make_shared<ls_std::Long>();
-  std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJSONLong>(requestedObject);
+  std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJsonLong>(requestedObject);
   requestedObject->setSerializable(serializable);
 
   return std::dynamic_pointer_cast<ls_std::Class>(requestedObject);

source/ls_std/factory/serialization/json/boxing/SerializableJSONStringFactory.cpp → source/ls_std/factory/serialization/json/boxing/SerializableJsonStringFactory.cpp

@@ -3,21 +3,21 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-25
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/factory/serialization/json/boxing/SerializableJSONStringFactory.hpp>
+#include <ls_std/factory/serialization/json/boxing/SerializableJsonStringFactory.hpp>
 #include <ls_std/boxing/String.hpp>
-#include <ls_std/serialization/json/boxing/SerializableJSONString.hpp>
+#include <ls_std/serialization/json/boxing/SerializableJsonString.hpp>
 
-ls_std::SerializableJSONStringFactory::SerializableJSONStringFactory() : ls_std::Class("SerializableJSONStringFactory")
+ls_std::SerializableJsonStringFactory::SerializableJsonStringFactory() : ls_std::Class("SerializableJsonStringFactory")
 {}
 
-std::shared_ptr<ls_std::Class> ls_std::SerializableJSONStringFactory::build()
+std::shared_ptr<ls_std::Class> ls_std::SerializableJsonStringFactory::build()
 {
   std::shared_ptr<ls_std::String> requestedObject = std::make_shared<ls_std::String>();
-  std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJSONString>(requestedObject);
+  std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJsonString>(requestedObject);
   requestedObject->setSerializable(serializable);
 
   return std::dynamic_pointer_cast<ls_std::Class>(requestedObject);

source/ls_std/factory/serialization/json/event/SerializableJSONEventFactory.cpp → source/ls_std/factory/serialization/json/event/SerializableJsonEventFactory.cpp

@@ -3,21 +3,21 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-30
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/factory/serialization/json/event/SerializableJSONEventFactory.hpp>
+#include <ls_std/factory/serialization/json/event/SerializableJsonEventFactory.hpp>
 #include <ls_std/event/Event.hpp>
-#include <ls_std/serialization/json/event/SerializableJSONEvent.hpp>
+#include <ls_std/serialization/json/event/SerializableJsonEvent.hpp>
 
-ls_std::SerializableJSONEventFactory::SerializableJSONEventFactory() : ls_std::Class("SerializableJSONEventFactory")
+ls_std::SerializableJsonEventFactory::SerializableJsonEventFactory() : ls_std::Class("SerializableJsonEventFactory")
 {}
 
-std::shared_ptr<ls_std::Class> ls_std::SerializableJSONEventFactory::build()
+std::shared_ptr<ls_std::Class> ls_std::SerializableJsonEventFactory::build()
 {
   std::shared_ptr<ls_std::Event> requestedObject = std::make_shared<ls_std::Event>("TMP_ID");
-  std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJSONEvent>(requestedObject);
+  std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJsonEvent>(requestedObject);
   requestedObject->setSerializable(serializable);
 
   return std::dynamic_pointer_cast<ls_std::Class>(requestedObject);

source/ls_std/serialization/json/boxing/SerializableJSONBoolean.cpp → source/ls_std/serialization/json/boxing/SerializableJsonBoolean.cpp

@@ -3,25 +3,25 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-04
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/serialization/json/boxing/SerializableJSONBoolean.hpp>
+#include <ls_std/serialization/json/boxing/SerializableJsonBoolean.hpp>
 #include <ls_std/exception/IllegalArgumentException.hpp>
 
-ls_std::SerializableJSONBoolean::SerializableJSONBoolean(const std::shared_ptr<ls_std::Boolean> &_value) : ls_std::Class("SerializableJSONBoolean")
+ls_std::SerializableJsonBoolean::SerializableJsonBoolean(const std::shared_ptr<ls_std::Boolean> &_value) : ls_std::Class("SerializableJsonBoolean")
 {
   this->_assignValue(_value);
 }
 
-ls_std::byte_field ls_std::SerializableJSONBoolean::marshal()
+ls_std::byte_field ls_std::SerializableJsonBoolean::marshal()
 {
   this->_update();
   return this->jsonObject.dump();
 }
 
-void ls_std::SerializableJSONBoolean::unmarshal(const ls_std::byte_field &_data)
+void ls_std::SerializableJsonBoolean::unmarshal(const ls_std::byte_field &_data)
 {
   this->jsonObject = nlohmann::json::parse(_data);
 
@@ -31,17 +31,17 @@ void ls_std::SerializableJSONBoolean::unmarshal(const ls_std::byte_field &_data)
   }
 }
 
-std::shared_ptr<ls_std::Boolean> ls_std::SerializableJSONBoolean::getValue()
+std::shared_ptr<ls_std::Boolean> ls_std::SerializableJsonBoolean::getValue()
 {
   return this->value;
 }
 
-void ls_std::SerializableJSONBoolean::setValue(const std::shared_ptr<ls_std::Boolean> &_value)
+void ls_std::SerializableJsonBoolean::setValue(const std::shared_ptr<ls_std::Boolean> &_value)
 {
   this->_assignValue(_value);
 }
 
-void ls_std::SerializableJSONBoolean::_assignValue(const std::shared_ptr<ls_std::Boolean> &_value)
+void ls_std::SerializableJsonBoolean::_assignValue(const std::shared_ptr<ls_std::Boolean> &_value)
 {
   if (_value == nullptr)
   {
@@ -51,7 +51,7 @@ void ls_std::SerializableJSONBoolean::_assignValue(const std::shared_ptr<ls_std:
   this->value = _value;
 }
 
-void ls_std::SerializableJSONBoolean::_update()
+void ls_std::SerializableJsonBoolean::_update()
 {
   this->jsonObject = {{"value", this->value->getValue()}};
 }

source/ls_std/serialization/json/boxing/SerializableJSONDouble.cpp → source/ls_std/serialization/json/boxing/SerializableJsonDouble.cpp

@@ -3,25 +3,25 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-04
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/serialization/json/boxing/SerializableJSONDouble.hpp>
+#include <ls_std/serialization/json/boxing/SerializableJsonDouble.hpp>
 #include <ls_std/exception/IllegalArgumentException.hpp>
 
-ls_std::SerializableJSONDouble::SerializableJSONDouble(const std::shared_ptr<ls_std::Double> &_value) : ls_std::Class("SerializableJSONDouble")
+ls_std::SerializableJsonDouble::SerializableJsonDouble(const std::shared_ptr<ls_std::Double> &_value) : ls_std::Class("SerializableJsonDouble")
 {
   this->_assignValue(_value);
 }
 
-ls_std::byte_field ls_std::SerializableJSONDouble::marshal()
+ls_std::byte_field ls_std::SerializableJsonDouble::marshal()
 {
   this->_update();
   return this->jsonObject.dump();
 }
 
-void ls_std::SerializableJSONDouble::unmarshal(const ls_std::byte_field &_data)
+void ls_std::SerializableJsonDouble::unmarshal(const ls_std::byte_field &_data)
 {
   std::string jsonString = std::string(_data);
   this->jsonObject = nlohmann::json::parse(jsonString);
@@ -32,17 +32,17 @@ void ls_std::SerializableJSONDouble::unmarshal(const ls_std::byte_field &_data)
   }
 }
 
-std::shared_ptr<ls_std::Double> ls_std::SerializableJSONDouble::getValue()
+std::shared_ptr<ls_std::Double> ls_std::SerializableJsonDouble::getValue()
 {
   return this->value;
 }
 
-void ls_std::SerializableJSONDouble::setValue(const std::shared_ptr<ls_std::Double> &_value)
+void ls_std::SerializableJsonDouble::setValue(const std::shared_ptr<ls_std::Double> &_value)
 {
   this->_assignValue(_value);
 }
 
-void ls_std::SerializableJSONDouble::_assignValue(const std::shared_ptr<ls_std::Double> &_value)
+void ls_std::SerializableJsonDouble::_assignValue(const std::shared_ptr<ls_std::Double> &_value)
 {
   if (_value == nullptr)
   {
@@ -52,7 +52,7 @@ void ls_std::SerializableJSONDouble::_assignValue(const std::shared_ptr<ls_std::
   this->value = _value;
 }
 
-void ls_std::SerializableJSONDouble::_update()
+void ls_std::SerializableJsonDouble::_update()
 {
   this->jsonObject = {{"value", this->value->getValue()}};
 }

source/ls_std/serialization/json/boxing/SerializableJSONFloat.cpp → source/ls_std/serialization/json/boxing/SerializableJsonFloat.cpp

@@ -3,25 +3,25 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-04
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/serialization/json/boxing/SerializableJSONFloat.hpp>
+#include <ls_std/serialization/json/boxing/SerializableJsonFloat.hpp>
 #include <ls_std/exception/IllegalArgumentException.hpp>
 
-ls_std::SerializableJSONFloat::SerializableJSONFloat(const std::shared_ptr<ls_std::Float> &_value) : ls_std::Class("SerializableJSONFloat")
+ls_std::SerializableJsonFloat::SerializableJsonFloat(const std::shared_ptr<ls_std::Float> &_value) : ls_std::Class("SerializableJsonFloat")
 {
   this->_assignValue(_value);
 }
 
-ls_std::byte_field ls_std::SerializableJSONFloat::marshal()
+ls_std::byte_field ls_std::SerializableJsonFloat::marshal()
 {
   this->_update();
   return this->jsonObject.dump();
 }
 
-void ls_std::SerializableJSONFloat::unmarshal(const ls_std::byte_field &_data)
+void ls_std::SerializableJsonFloat::unmarshal(const ls_std::byte_field &_data)
 {
   std::string jsonString = std::string(_data);
   this->jsonObject = nlohmann::json::parse(jsonString);
@@ -32,17 +32,17 @@ void ls_std::SerializableJSONFloat::unmarshal(const ls_std::byte_field &_data)
   }
 }
 
-std::shared_ptr<ls_std::Float> ls_std::SerializableJSONFloat::getValue()
+std::shared_ptr<ls_std::Float> ls_std::SerializableJsonFloat::getValue()
 {
   return this->value;
 }
 
-void ls_std::SerializableJSONFloat::setValue(const std::shared_ptr<ls_std::Float> &_value)
+void ls_std::SerializableJsonFloat::setValue(const std::shared_ptr<ls_std::Float> &_value)
 {
   this->_assignValue(_value);
 }
 
-void ls_std::SerializableJSONFloat::_assignValue(const std::shared_ptr<ls_std::Float> &_value)
+void ls_std::SerializableJsonFloat::_assignValue(const std::shared_ptr<ls_std::Float> &_value)
 {
   if (_value == nullptr)
   {
@@ -52,7 +52,7 @@ void ls_std::SerializableJSONFloat::_assignValue(const std::shared_ptr<ls_std::F
   this->value = _value;
 }
 
-void ls_std::SerializableJSONFloat::_update()
+void ls_std::SerializableJsonFloat::_update()
 {
   this->jsonObject = {{"value", this->value->getValue()}};
 }

source/ls_std/serialization/json/boxing/SerializableJSONInteger.cpp → source/ls_std/serialization/json/boxing/SerializableJsonInteger.cpp

@@ -3,25 +3,25 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-21
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/serialization/json/boxing/SerializableJSONInteger.hpp>
+#include <ls_std/serialization/json/boxing/SerializableJsonInteger.hpp>
 #include <ls_std/exception/IllegalArgumentException.hpp>
 
-ls_std::SerializableJSONInteger::SerializableJSONInteger(const std::shared_ptr<ls_std::Integer> &_value) : ls_std::Class("SerializableJSONInteger")
+ls_std::SerializableJsonInteger::SerializableJsonInteger(const std::shared_ptr<ls_std::Integer> &_value) : ls_std::Class("SerializableJsonInteger")
 {
   this->_assignValue(_value);
 }
 
-ls_std::byte_field ls_std::SerializableJSONInteger::marshal()
+ls_std::byte_field ls_std::SerializableJsonInteger::marshal()
 {
   this->_update();
   return this->jsonObject.dump();
 }
 
-void ls_std::SerializableJSONInteger::unmarshal(const ls_std::byte_field &_data)
+void ls_std::SerializableJsonInteger::unmarshal(const ls_std::byte_field &_data)
 {
   std::string jsonString = std::string(_data);
   this->jsonObject = nlohmann::json::parse(jsonString);
@@ -32,17 +32,17 @@ void ls_std::SerializableJSONInteger::unmarshal(const ls_std::byte_field &_data)
   }
 }
 
-std::shared_ptr<ls_std::Integer> ls_std::SerializableJSONInteger::getValue()
+std::shared_ptr<ls_std::Integer> ls_std::SerializableJsonInteger::getValue()
 {
   return this->value;
 }
 
-void ls_std::SerializableJSONInteger::setValue(const std::shared_ptr<ls_std::Integer> &_value)
+void ls_std::SerializableJsonInteger::setValue(const std::shared_ptr<ls_std::Integer> &_value)
 {
   this->_assignValue(_value);
 }
 
-void ls_std::SerializableJSONInteger::_assignValue(const std::shared_ptr<ls_std::Integer> &_value)
+void ls_std::SerializableJsonInteger::_assignValue(const std::shared_ptr<ls_std::Integer> &_value)
 {
   if (_value == nullptr)
   {
@@ -52,7 +52,7 @@ void ls_std::SerializableJSONInteger::_assignValue(const std::shared_ptr<ls_std:
   this->value = _value;
 }
 
-void ls_std::SerializableJSONInteger::_update()
+void ls_std::SerializableJsonInteger::_update()
 {
   this->jsonObject = {{"value", this->value->getValue()}};
 }

source/ls_std/serialization/json/boxing/SerializableJSONLong.cpp → source/ls_std/serialization/json/boxing/SerializableJsonLong.cpp

@@ -3,25 +3,25 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-25
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/serialization/json/boxing/SerializableJSONLong.hpp>
+#include <ls_std/serialization/json/boxing/SerializableJsonLong.hpp>
 #include <ls_std/exception/IllegalArgumentException.hpp>
 
-ls_std::SerializableJSONLong::SerializableJSONLong(const std::shared_ptr<ls_std::Long> &_value) : ls_std::Class("SerializableJSONLong")
+ls_std::SerializableJsonLong::SerializableJsonLong(const std::shared_ptr<ls_std::Long> &_value) : ls_std::Class("SerializableJsonLong")
 {
   this->_assignValue(_value);
 }
 
-ls_std::byte_field ls_std::SerializableJSONLong::marshal()
+ls_std::byte_field ls_std::SerializableJsonLong::marshal()
 {
   this->_update();
   return this->jsonObject.dump();
 }
 
-void ls_std::SerializableJSONLong::unmarshal(const ls_std::byte_field &_data)
+void ls_std::SerializableJsonLong::unmarshal(const ls_std::byte_field &_data)
 {
   std::string jsonString = std::string(_data);
   this->jsonObject = nlohmann::json::parse(jsonString);
@@ -32,17 +32,17 @@ void ls_std::SerializableJSONLong::unmarshal(const ls_std::byte_field &_data)
   }
 }
 
-std::shared_ptr<ls_std::Long> ls_std::SerializableJSONLong::getValue()
+std::shared_ptr<ls_std::Long> ls_std::SerializableJsonLong::getValue()
 {
   return this->value;
 }
 
-void ls_std::SerializableJSONLong::setValue(const std::shared_ptr<ls_std::Long> &_value)
+void ls_std::SerializableJsonLong::setValue(const std::shared_ptr<ls_std::Long> &_value)
 {
   this->_assignValue(_value);
 }
 
-void ls_std::SerializableJSONLong::_assignValue(const std::shared_ptr<ls_std::Long> &_value)
+void ls_std::SerializableJsonLong::_assignValue(const std::shared_ptr<ls_std::Long> &_value)
 {
   if (_value == nullptr)
   {
@@ -52,7 +52,7 @@ void ls_std::SerializableJSONLong::_assignValue(const std::shared_ptr<ls_std::Lo
   this->value = _value;
 }
 
-void ls_std::SerializableJSONLong::_update()
+void ls_std::SerializableJsonLong::_update()
 {
   this->jsonObject = {{"value", (ls_std::long_type) this->value->getValue()}};
 }

source/ls_std/serialization/json/boxing/SerializableJSONString.cpp → source/ls_std/serialization/json/boxing/SerializableJsonString.cpp

@@ -3,25 +3,25 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-30
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/serialization/json/boxing/SerializableJSONString.hpp>
+#include <ls_std/serialization/json/boxing/SerializableJsonString.hpp>
 #include <ls_std/exception/IllegalArgumentException.hpp>
 
-ls_std::SerializableJSONString::SerializableJSONString(const std::shared_ptr<ls_std::String> &_value) : ls_std::Class("SerializableJSONString")
+ls_std::SerializableJsonString::SerializableJsonString(const std::shared_ptr<ls_std::String> &_value) : ls_std::Class("SerializableJsonString")
 {
   this->_assignValue(_value);
 }
 
-ls_std::byte_field ls_std::SerializableJSONString::marshal()
+ls_std::byte_field ls_std::SerializableJsonString::marshal()
 {
   this->_update();
   return this->jsonObject.dump();
 }
 
-void ls_std::SerializableJSONString::unmarshal(const ls_std::byte_field &_data)
+void ls_std::SerializableJsonString::unmarshal(const ls_std::byte_field &_data)
 {
   this->jsonObject = nlohmann::json::parse(_data);
 
@@ -31,17 +31,17 @@ void ls_std::SerializableJSONString::unmarshal(const ls_std::byte_field &_data)
   }
 }
 
-std::shared_ptr<ls_std::String> ls_std::SerializableJSONString::getValue()
+std::shared_ptr<ls_std::String> ls_std::SerializableJsonString::getValue()
 {
   return this->value;
 }
 
-void ls_std::SerializableJSONString::setValue(const std::shared_ptr<ls_std::String> &_value)
+void ls_std::SerializableJsonString::setValue(const std::shared_ptr<ls_std::String> &_value)
 {
   this->_assignValue(_value);
 }
 
-void ls_std::SerializableJSONString::_assignValue(const std::shared_ptr<ls_std::String> &_value)
+void ls_std::SerializableJsonString::_assignValue(const std::shared_ptr<ls_std::String> &_value)
 {
   if (_value == nullptr)
   {
@@ -51,7 +51,7 @@ void ls_std::SerializableJSONString::_assignValue(const std::shared_ptr<ls_std::
   this->value = _value;
 }
 
-void ls_std::SerializableJSONString::_update()
+void ls_std::SerializableJsonString::_update()
 {
   this->jsonObject = {{"value", this->value->toString()}};
 }

source/ls_std/serialization/json/event/SerializableJSONEvent.cpp → source/ls_std/serialization/json/event/SerializableJsonEvent.cpp

@@ -3,25 +3,25 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-07
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/serialization/json/event/SerializableJSONEvent.hpp>
+#include <ls_std/serialization/json/event/SerializableJsonEvent.hpp>
 #include <ls_std/exception/NullPointerException.hpp>
 
-ls_std::SerializableJSONEvent::SerializableJSONEvent(const std::shared_ptr<ls_std::Event> &_value) : ls_std::Class("SerializableJSONEvent")
+ls_std::SerializableJsonEvent::SerializableJsonEvent(const std::shared_ptr<ls_std::Event> &_value) : ls_std::Class("SerializableJsonEvent")
 {
   this->_assignValue(_value);
 }
 
-ls_std::byte_field ls_std::SerializableJSONEvent::marshal()
+ls_std::byte_field ls_std::SerializableJsonEvent::marshal()
 {
   this->_update();
   return this->jsonObject.dump();
 }
 
-void ls_std::SerializableJSONEvent::unmarshal(const ls_std::byte_field &_data)
+void ls_std::SerializableJsonEvent::unmarshal(const ls_std::byte_field &_data)
 {
   this->jsonObject = nlohmann::json::parse(_data);
 
@@ -29,17 +29,17 @@ void ls_std::SerializableJSONEvent::unmarshal(const ls_std::byte_field &_data)
   this->_unmarshalParameterList();
 }
 
-std::shared_ptr<ls_std::Event> ls_std::SerializableJSONEvent::getValue()
+std::shared_ptr<ls_std::Event> ls_std::SerializableJsonEvent::getValue()
 {
   return this->value;
 }
 
-void ls_std::SerializableJSONEvent::setValue(const std::shared_ptr<ls_std::Event> &_value)
+void ls_std::SerializableJsonEvent::setValue(const std::shared_ptr<ls_std::Event> &_value)
 {
   this->_assignValue(_value);
 }
 
-void ls_std::SerializableJSONEvent::_assignValue(const std::shared_ptr<ls_std::Event> &_value)
+void ls_std::SerializableJsonEvent::_assignValue(const std::shared_ptr<ls_std::Event> &_value)
 {
   if (_value == nullptr)
   {
@@ -49,25 +49,25 @@ void ls_std::SerializableJSONEvent::_assignValue(const std::shared_ptr<ls_std::E
   this->value = _value;
 }
 
-void ls_std::SerializableJSONEvent::_unmarshalParameterList()
+void ls_std::SerializableJsonEvent::_unmarshalParameterList()
 {
   this->value->clearParameterList();
 
-  for (const auto &parameterJSON : this->jsonObject["parameterList"])
+  for (const auto &parameterJson : this->jsonObject["parameterList"])
   {
-    ls_std::event_parameter parameter = {parameterJSON.at(0), parameterJSON.at(1)};
+    ls_std::event_parameter parameter = {parameterJson.at(0), parameterJson.at(1)};
     this->value->addParameter(parameter);
   }
 }
 
-void ls_std::SerializableJSONEvent::_update()
+void ls_std::SerializableJsonEvent::_update()
 {
   this->jsonObject = {{"id", this->value->getId()}};
 
   this->_updateEventParameterList();
 }
 
-void ls_std::SerializableJSONEvent::_updateEventParameterList()
+void ls_std::SerializableJsonEvent::_updateEventParameterList()
 {
   std::string jsonString{};
 

source/ls_std/serialization/json/logic/SerializableJSONState.cpp → source/ls_std/serialization/json/logic/SerializableJsonState.cpp

@@ -3,26 +3,26 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-15
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/serialization/json/logic/SerializableJSONState.hpp>
-#include <ls_std/serialization/json/logic/SerializableJSONStateConnection.hpp>
+#include <ls_std/serialization/json/logic/SerializableJsonState.hpp>
+#include <ls_std/serialization/json/logic/SerializableJsonStateConnection.hpp>
 #include <ls_std/exception/IllegalArgumentException.hpp>
 
-ls_std::SerializableJSONState::SerializableJSONState(const std::shared_ptr<ls_std::State> &_value) : ls_std::Class("SerializableJSONState")
+ls_std::SerializableJsonState::SerializableJsonState(const std::shared_ptr<ls_std::State> &_value) : ls_std::Class("SerializableJsonState")
 {
   this->_assignValue(_value);
 }
 
-ls_std::byte_field ls_std::SerializableJSONState::marshal()
+ls_std::byte_field ls_std::SerializableJsonState::marshal()
 {
   this->_update();
   return this->jsonObject.dump();
 }
 
-void ls_std::SerializableJSONState::unmarshal(const ls_std::byte_field &_data)
+void ls_std::SerializableJsonState::unmarshal(const ls_std::byte_field &_data)
 {
   this->jsonObject = nlohmann::json::parse(_data);
 
@@ -30,18 +30,18 @@ void ls_std::SerializableJSONState::unmarshal(const ls_std::byte_field &_data)
   this->value->setId(this->jsonObject["id"]);
 }
 
-std::shared_ptr<ls_std::State> ls_std::SerializableJSONState::getValue()
+std::shared_ptr<ls_std::State> ls_std::SerializableJsonState::getValue()
 {
   return this->value;
 }
 
-void ls_std::SerializableJSONState::setValue(const std::shared_ptr<ls_std::State> &_value)
+void ls_std::SerializableJsonState::setValue(const std::shared_ptr<ls_std::State> &_value)
 {
   this->_assignValue(_value);
   this->_clear();
 }
 
-void ls_std::SerializableJSONState::_assignValue(const std::shared_ptr<ls_std::State> &_value)
+void ls_std::SerializableJsonState::_assignValue(const std::shared_ptr<ls_std::State> &_value)
 {
   if (_value == nullptr)
   {
@@ -51,40 +51,40 @@ void ls_std::SerializableJSONState::_assignValue(const std::shared_ptr<ls_std::S
   this->value = _value;
 }
 
-void ls_std::SerializableJSONState::_clear()
+void ls_std::SerializableJsonState::_clear()
 {
   this->jsonObject.clear();
 }
 
-void ls_std::SerializableJSONState::_unmarshalStateConnections()
+void ls_std::SerializableJsonState::_unmarshalStateConnections()
 {
   if (!this->jsonObject["connectedStates"].empty())
   {
     this->value->clearConnections();
 
-    for (const auto &connectionJSON : this->jsonObject["connectedStates"])
+    for (const auto &connectionJson : this->jsonObject["connectedStates"])
     {
       std::shared_ptr<ls_std::StateConnection> connection = std::make_shared<ls_std::StateConnection>("TMP_ID", "TMP_ID");
-      ls_std::SerializableJSONStateConnection{connection}.unmarshal(connectionJSON.dump());
+      ls_std::SerializableJsonStateConnection{connection}.unmarshal(connectionJson.dump());
       this->value->addStateConnection(connection);
     }
   }
 }
 
-void ls_std::SerializableJSONState::_update()
+void ls_std::SerializableJsonState::_update()
 {
   this->jsonObject = {{"id", this->value->getId()}};
 
   this->_updateStateConnections();
 }
 
-void ls_std::SerializableJSONState::_updateStateConnections()
+void ls_std::SerializableJsonState::_updateStateConnections()
 {
   std::string jsonString{};
 
   for (const auto &connection : this->value->getConnectedStates())
   {
-    jsonString = ls_std::SerializableJSONStateConnection{connection.second}.marshal();
+    jsonString = ls_std::SerializableJsonStateConnection{connection.second}.marshal();
     this->jsonObject["connectedStates"][connection.first] = nlohmann::json::parse(jsonString);
   }
 }

source/ls_std/serialization/json/logic/SerializableJSONStateConnection.cpp → source/ls_std/serialization/json/logic/SerializableJsonStateConnection.cpp

@@ -3,25 +3,25 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-14
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/serialization/json/logic/SerializableJSONStateConnection.hpp>
+#include <ls_std/serialization/json/logic/SerializableJsonStateConnection.hpp>
 #include <ls_std/exception/IllegalArgumentException.hpp>
 
-ls_std::SerializableJSONStateConnection::SerializableJSONStateConnection(const std::shared_ptr<ls_std::StateConnection> &_value) : ls_std::Class("SerializableJSONStateConnection")
+ls_std::SerializableJsonStateConnection::SerializableJsonStateConnection(const std::shared_ptr<ls_std::StateConnection> &_value) : ls_std::Class("SerializableJsonStateConnection")
 {
   this->_assignValue(_value);
 }
 
-ls_std::byte_field ls_std::SerializableJSONStateConnection::marshal()
+ls_std::byte_field ls_std::SerializableJsonStateConnection::marshal()
 {
   this->_update();
   return this->jsonObject.dump();
 }
 
-void ls_std::SerializableJSONStateConnection::unmarshal(const ls_std::byte_field &_data)
+void ls_std::SerializableJsonStateConnection::unmarshal(const ls_std::byte_field &_data)
 {
   std::string jsonString = std::string(_data);
   this->jsonObject = nlohmann::json::parse(jsonString);
@@ -31,18 +31,18 @@ void ls_std::SerializableJSONStateConnection::unmarshal(const ls_std::byte_field
   this->value->updatePassCondition(this->jsonObject["condition"]);
 }
 
-std::shared_ptr<ls_std::StateConnection> ls_std::SerializableJSONStateConnection::getValue()
+std::shared_ptr<ls_std::StateConnection> ls_std::SerializableJsonStateConnection::getValue()
 {
   return this->value;
 }
 
-void ls_std::SerializableJSONStateConnection::setValue(const std::shared_ptr<ls_std::StateConnection> &_value)
+void ls_std::SerializableJsonStateConnection::setValue(const std::shared_ptr<ls_std::StateConnection> &_value)
 {
   this->_assignValue(_value);
   this->_clear();
 }
 
-void ls_std::SerializableJSONStateConnection::_assignValue(const std::shared_ptr<ls_std::StateConnection> &_value)
+void ls_std::SerializableJsonStateConnection::_assignValue(const std::shared_ptr<ls_std::StateConnection> &_value)
 {
   if (_value == nullptr)
   {
@@ -52,12 +52,12 @@ void ls_std::SerializableJSONStateConnection::_assignValue(const std::shared_ptr
   this->value = _value;
 }
 
-void ls_std::SerializableJSONStateConnection::_clear()
+void ls_std::SerializableJsonStateConnection::_clear()
 {
   this->jsonObject.clear();
 }
 
-void ls_std::SerializableJSONStateConnection::_update()
+void ls_std::SerializableJsonStateConnection::_update()
 {
   this->jsonObject = {{"condition",    this->value->isPassable()},
                       {"connectionId", this->value->getConnectionId()},

source/ls_std/serialization/json/logic/SerializableJSONStateMachine.cpp → source/ls_std/serialization/json/logic/SerializableJsonStateMachine.cpp

@@ -3,26 +3,26 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-17
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/serialization/json/logic/SerializableJSONStateMachine.hpp>
-#include <ls_std/serialization/json/logic/SerializableJSONState.hpp>
+#include <ls_std/serialization/json/logic/SerializableJsonStateMachine.hpp>
+#include <ls_std/serialization/json/logic/SerializableJsonState.hpp>
 #include <ls_std/exception/IllegalArgumentException.hpp>
 
-ls_std::SerializableJSONStateMachine::SerializableJSONStateMachine(const std::shared_ptr<ls_std::StateMachine> &_value) : ls_std::Class("SerializableJSONStateMachine")
+ls_std::SerializableJsonStateMachine::SerializableJsonStateMachine(const std::shared_ptr<ls_std::StateMachine> &_value) : ls_std::Class("SerializableJsonStateMachine")
 {
   this->_assignValue(_value);
 }
 
-ls_std::byte_field ls_std::SerializableJSONStateMachine::marshal()
+ls_std::byte_field ls_std::SerializableJsonStateMachine::marshal()
 {
   this->_update();
   return this->jsonObject.dump();
 }
 
-void ls_std::SerializableJSONStateMachine::unmarshal(const ls_std::byte_field &_data)
+void ls_std::SerializableJsonStateMachine::unmarshal(const ls_std::byte_field &_data)
 {
   this->jsonObject = nlohmann::json::parse(_data);
 
@@ -32,17 +32,17 @@ void ls_std::SerializableJSONStateMachine::unmarshal(const ls_std::byte_field &_
   this->value->setName(this->jsonObject["name"]);
 }
 
-std::shared_ptr<ls_std::StateMachine> ls_std::SerializableJSONStateMachine::getValue()
+std::shared_ptr<ls_std::StateMachine> ls_std::SerializableJsonStateMachine::getValue()
 {
   return this->value;
 }
 
-void ls_std::SerializableJSONStateMachine::setValue(const std::shared_ptr<ls_std::StateMachine> &_value)
+void ls_std::SerializableJsonStateMachine::setValue(const std::shared_ptr<ls_std::StateMachine> &_value)
 {
   this->_assignValue(_value);
 }
 
-void ls_std::SerializableJSONStateMachine::_assignValue(const std::shared_ptr<ls_std::StateMachine> &_value)
+void ls_std::SerializableJsonStateMachine::_assignValue(const std::shared_ptr<ls_std::StateMachine> &_value)
 {
   if (_value == nullptr)
   {
@@ -52,7 +52,7 @@ void ls_std::SerializableJSONStateMachine::_assignValue(const std::shared_ptr<ls
   this->value = _value;
 }
 
-void ls_std::SerializableJSONStateMachine::_unmarshalCurrentState()
+void ls_std::SerializableJsonStateMachine::_unmarshalCurrentState()
 {
   if (this->jsonObject.contains("currentState"))
   {
@@ -60,17 +60,17 @@ void ls_std::SerializableJSONStateMachine::_unmarshalCurrentState()
   }
 }
 
-void ls_std::SerializableJSONStateMachine::_unmarshalStates()
+void ls_std::SerializableJsonStateMachine::_unmarshalStates()
 {
   for (const auto &serializedState : this->jsonObject["states"])
   {
     std::shared_ptr<ls_std::State> state = std::make_shared<ls_std::State>("");
-    ls_std::SerializableJSONState{state}.unmarshal(serializedState.dump());
+    ls_std::SerializableJsonState{state}.unmarshal(serializedState.dump());
     this->value->addState(state);
   }
 }
 
-void ls_std::SerializableJSONStateMachine::_update()
+void ls_std::SerializableJsonStateMachine::_update()
 {
   this->jsonObject = {{"memory", this->value->getMemory()},
                       {"name",   this->value->getName()}};
@@ -79,7 +79,7 @@ void ls_std::SerializableJSONStateMachine::_update()
   this->_updateStates();
 }
 
-void ls_std::SerializableJSONStateMachine::_updateCurrentState()
+void ls_std::SerializableJsonStateMachine::_updateCurrentState()
 {
   if (this->value->getCurrentState() != nullptr)
   {
@@ -87,13 +87,13 @@ void ls_std::SerializableJSONStateMachine::_updateCurrentState()
   }
 }
 
-void ls_std::SerializableJSONStateMachine::_updateStates()
+void ls_std::SerializableJsonStateMachine::_updateStates()
 {
   std::string jsonString{};
 
   for (const auto &state : this->value->getStates())
   {
-    jsonString = ls_std::SerializableJSONState{state.second}.marshal();
+    jsonString = ls_std::SerializableJsonState{state.second}.marshal();
     this->jsonObject["states"][state.first] = nlohmann::json::parse(jsonString);
   }
 }

test/cases/boxing/BooleanTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-09
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -126,7 +126,7 @@ namespace
     ls_std::FileWriter writer{file};
     writer.write(R"({"value":true})");
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONBoolean>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonBoolean>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
 
     auto storable = std::make_shared<ls_std::StorableFile>(path);
@@ -144,7 +144,7 @@ namespace
   {
     std::shared_ptr<ls_std::Boolean> x = std::make_shared<ls_std::Boolean>(true);
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONBoolean>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonBoolean>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
 
     ASSERT_STREQ(R"({"value":true})", x->marshal().c_str());
@@ -196,7 +196,7 @@ namespace
 
     ASSERT_FALSE(*x);
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONBoolean>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonBoolean>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
     x->unmarshal(R"({"value":true})");
 

test/cases/boxing/DoubleTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -285,7 +285,7 @@ namespace
     ls_std::FileWriter writer{file};
     writer.write(R"({"value":3.14159})");
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONDouble>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonDouble>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
 
     auto storable = std::make_shared<ls_std::StorableFile>(path);
@@ -303,7 +303,7 @@ namespace
   {
     std::shared_ptr<ls_std::Double> x = std::make_shared<ls_std::Double>(3.14159);
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONDouble>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonDouble>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
     ls_std::String jsonString{x->marshal()};
 
@@ -337,7 +337,7 @@ namespace
 
     ASSERT_DOUBLE_EQ(3.14159, *x);
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONDouble>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonDouble>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
     x->unmarshal(R"({"value":17.4132})");
 

test/cases/boxing/FloatTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -285,7 +285,7 @@ namespace
     ls_std::FileWriter writer{file};
     writer.write(R"({"value":3.14159})");
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONFloat>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonFloat>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
 
     auto storable = std::make_shared<ls_std::StorableFile>(path);
@@ -303,7 +303,7 @@ namespace
   {
     std::shared_ptr<ls_std::Float> x = std::make_shared<ls_std::Float>(3.14159f);
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONFloat>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonFloat>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
     ls_std::String jsonString{x->marshal()};
 
@@ -337,7 +337,7 @@ namespace
 
     ASSERT_FLOAT_EQ(3.14159f, *x);
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONFloat>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonFloat>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
     x->unmarshal(R"({"value":17.4132})");
 

test/cases/boxing/IntegerTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-09
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -351,7 +351,7 @@ namespace
     ls_std::FileWriter writer{file};
     writer.write(R"({"value":1990})");
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONInteger>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonInteger>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
 
     auto storable = std::make_shared<ls_std::StorableFile>(path);
@@ -369,7 +369,7 @@ namespace
   {
     std::shared_ptr<ls_std::Integer> x = std::make_shared<ls_std::Integer>(3);
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONInteger>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonInteger>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
 
     ASSERT_STREQ(R"({"value":3})", x->marshal().c_str());
@@ -400,7 +400,7 @@ namespace
     std::shared_ptr<ls_std::Integer> x = std::make_shared<ls_std::Integer>(13);
     ASSERT_EQ(13, *x);
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONInteger>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonInteger>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
 
     x->unmarshal(R"({"value":1989})");

test/cases/boxing/LongTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-17
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -351,7 +351,7 @@ namespace
     ls_std::FileWriter writer{file};
     writer.write(R"({"value":1990})");
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONLong>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonLong>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
 
     auto storable = std::make_shared<ls_std::StorableFile>(path);
@@ -369,7 +369,7 @@ namespace
   {
     std::shared_ptr<ls_std::Long> x = std::make_shared<ls_std::Long>(3);
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONLong>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonLong>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
 
     ASSERT_STREQ(R"({"value":3})", x->marshal().c_str());
@@ -400,7 +400,7 @@ namespace
     std::shared_ptr<ls_std::Long> x = std::make_shared<ls_std::Long>(13);
     ASSERT_EQ(13, *x);
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONLong>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonLong>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
 
     x->unmarshal(R"({"value":1989})");

test/cases/boxing/StringTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -108,7 +108,7 @@ namespace
     ls_std::FileWriter writer{file};
     writer.write(R"({"value":"Hello!"})");
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONString>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonString>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
 
     auto storable = std::make_shared<ls_std::StorableFile>(path);
@@ -126,7 +126,7 @@ namespace
   {
     std::shared_ptr<ls_std::String> x = std::make_shared<ls_std::String>("Hello!");
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONString>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonString>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
 
     ASSERT_STREQ(R"({"value":"Hello!"})", x->marshal().c_str());
@@ -155,7 +155,7 @@ namespace
     std::shared_ptr<ls_std::String> x = std::make_shared<ls_std::String>("Hello!");
     ASSERT_STREQ("Hello!", *x);
 
-    auto serializable = std::make_shared<ls_std::SerializableJSONString>(x);
+    auto serializable = std::make_shared<ls_std::SerializableJsonString>(x);
     x->setSerializable(std::dynamic_pointer_cast<ls_std::ISerializable>(serializable));
 
     x->unmarshal(R"({"value":"Test!"})");

test/cases/event/EventTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-11-26
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -34,7 +34,7 @@ namespace
     event.addParameter(ls_std::event_parameter{"key_available", "true"});
     event.addParameter(ls_std::event_parameter{"door_id", "16675"});
 
-    std::shared_ptr<ls_std::SerializableJSONEvent> serializable = std::make_shared<ls_std::SerializableJSONEvent>(std::make_shared<ls_std::Event>(event));
+    std::shared_ptr<ls_std::SerializableJsonEvent> serializable = std::make_shared<ls_std::SerializableJsonEvent>(std::make_shared<ls_std::Event>(event));
     event.setSerializable(serializable);
 
     ls_std::byte_field data = event.marshal();
@@ -46,7 +46,7 @@ namespace
   TEST_F(EventTest, unmarshal)
   {
     std::shared_ptr<ls_std::Event> event = std::make_shared<ls_std::Event>("TMP_EVENT");
-    std::shared_ptr<ls_std::SerializableJSONEvent> serializable = std::make_shared<ls_std::SerializableJSONEvent>(event);
+    std::shared_ptr<ls_std::SerializableJsonEvent> serializable = std::make_shared<ls_std::SerializableJsonEvent>(event);
     event->setSerializable(serializable);
 
     std::string jsonString = R"({"id":"OPEN_DOOR_EVENT","parameterList":{"door_id":["door_id","16675"],"key_available":["key_available","true"]}})";

test/cases/factory/serialization/json/SerializableFactoryTest.cpp

@@ -30,7 +30,7 @@ namespace
   TEST_F(SerializableFactoryTest, addFactory)
   {
     std::shared_ptr<ls_std_test::SerializableTestFactory> serializableTestFactory = std::make_shared<ls_std_test::SerializableTestFactory>();
-    ls_std::SerializableJSONFactory serializableFactory{};
+    ls_std::SerializableJsonFactory serializableFactory{};
 
     ASSERT_TRUE(serializableFactory.addFactory({"TestClass", serializableTestFactory}));
   }
@@ -38,7 +38,7 @@ namespace
   TEST_F(SerializableFactoryTest, addFactory_emptyKey)
   {
     std::shared_ptr<ls_std_test::SerializableTestFactory> serializableTestFactory = std::make_shared<ls_std_test::SerializableTestFactory>();
-    ls_std::SerializableJSONFactory serializableFactory{};
+    ls_std::SerializableJsonFactory serializableFactory{};
 
     EXPECT_THROW({
                    try
@@ -55,7 +55,7 @@ namespace
   TEST_F(SerializableFactoryTest, addFactory_nullPointerValueForFactory)
   {
     std::shared_ptr<ls_std_test::SerializableTestFactory> serializableTestFactory{};
-    ls_std::SerializableJSONFactory serializableFactory{};
+    ls_std::SerializableJsonFactory serializableFactory{};
 
     EXPECT_THROW({
                    try
@@ -72,7 +72,7 @@ namespace
   TEST_F(SerializableFactoryTest, addFactory_dublicatedElement)
   {
     std::shared_ptr<ls_std_test::SerializableTestFactory> serializableTestFactory = std::make_shared<ls_std_test::SerializableTestFactory>();
-    ls_std::SerializableJSONFactory serializableFactory{};
+    ls_std::SerializableJsonFactory serializableFactory{};
 
     ASSERT_TRUE(serializableFactory.addFactory({"TestClass", serializableTestFactory}));
     ASSERT_FALSE(serializableFactory.addFactory({"TestClass", serializableTestFactory}));
@@ -80,7 +80,7 @@ namespace
 
   TEST_F(SerializableFactoryTest, build)
   {
-    ls_std::SerializableJSONFactory serializableFactory{};
+    ls_std::SerializableJsonFactory serializableFactory{};
     std::shared_ptr<ls_std::Class> serializable = serializableFactory.build(ls_std::Boolean{}.getClassName());
 
     ASSERT_TRUE(serializable != nullptr);
@@ -89,7 +89,7 @@ namespace
 
   TEST_F(SerializableFactoryTest, build_factoryNotAvailable)
   {
-    ls_std::SerializableJSONFactory serializableFactory{};
+    ls_std::SerializableJsonFactory serializableFactory{};
     std::shared_ptr<ls_std::Class> serializable = serializableFactory.build(ls_std_test::GossipNewsAgency{}.getClassName());
 
     ASSERT_FALSE(serializable != nullptr);
@@ -97,13 +97,13 @@ namespace
 
   TEST_F(SerializableFactoryTest, clear)
   {
-    ls_std::SerializableJSONFactory serializableFactory{};
+    ls_std::SerializableJsonFactory serializableFactory{};
     ASSERT_TRUE(serializableFactory.clear());
   }
 
   TEST_F(SerializableFactoryTest, hasFactory_ofBoxingPackage)
   {
-    ls_std::SerializableJSONFactory serializableFactory{};
+    ls_std::SerializableJsonFactory serializableFactory{};
     ASSERT_TRUE(serializableFactory.hasFactory(ls_std::Boolean{}.getClassName()));
     ASSERT_TRUE(serializableFactory.hasFactory(ls_std::Double{}.getClassName()));
     ASSERT_TRUE(serializableFactory.hasFactory(ls_std::Float{}.getClassName()));
@@ -114,19 +114,19 @@ namespace
 
   TEST_F(SerializableFactoryTest, hasFactory_factoryNotAvailable)
   {
-    ls_std::SerializableJSONFactory serializableFactory{};
+    ls_std::SerializableJsonFactory serializableFactory{};
     ASSERT_FALSE(serializableFactory.hasFactory(ls_std_test::GossipNewsAgency{}.getClassName()));
   }
 
   TEST_F(SerializableFactoryTest, removeFactory)
   {
-    ls_std::SerializableJSONFactory serializableFactory{};
+    ls_std::SerializableJsonFactory serializableFactory{};
     ASSERT_TRUE(serializableFactory.removeFactory(ls_std::Boolean{}.getClassName()));
   }
 
   TEST_F(SerializableFactoryTest, removeFactory_factoryNotAvailable)
   {
-    ls_std::SerializableJSONFactory serializableFactory{};
+    ls_std::SerializableJsonFactory serializableFactory{};
     ASSERT_FALSE(serializableFactory.removeFactory(ls_std_test::GossipNewsAgency{}.getClassName()));
   }
 }

test/cases/factory/serialization/json/boxing/SerializableJSONBooleanFactoryTest.cpp → test/cases/factory/serialization/json/boxing/SerializableJsonBooleanFactoryTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-23
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class SerializableJSONBooleanFactoryTest : public ::testing::Test
+  class SerializableJsonBooleanFactoryTest : public ::testing::Test
   {
     protected:
 
-      SerializableJSONBooleanFactoryTest() = default;
-      ~SerializableJSONBooleanFactoryTest() override = default;
+      SerializableJsonBooleanFactoryTest() = default;
+      ~SerializableJsonBooleanFactoryTest() override = default;
 
       void SetUp() override
       {}
@@ -26,9 +26,9 @@ namespace
       {}
   };
 
-  TEST_F(SerializableJSONBooleanFactoryTest, build)
+  TEST_F(SerializableJsonBooleanFactoryTest, build)
   {
-    std::shared_ptr<ls_std::Boolean> value = std::dynamic_pointer_cast<ls_std::Boolean>(ls_std::SerializableJSONBooleanFactory{}.build());
+    std::shared_ptr<ls_std::Boolean> value = std::dynamic_pointer_cast<ls_std::Boolean>(ls_std::SerializableJsonBooleanFactory{}.build());
     ASSERT_TRUE(value != nullptr);
     ASSERT_STREQ("Boolean", value->getClassName().c_str());
   }

test/cases/factory/serialization/json/boxing/SerializableJSONDoubleFactoryTest.cpp → test/cases/factory/serialization/json/boxing/SerializableJsonDoubleFactoryTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-24
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class SerializableJSONDoubleFactoryTest : public ::testing::Test
+  class SerializableJsonDoubleFactoryTest : public ::testing::Test
   {
     protected:
 
-      SerializableJSONDoubleFactoryTest() = default;
-      ~SerializableJSONDoubleFactoryTest() override = default;
+      SerializableJsonDoubleFactoryTest() = default;
+      ~SerializableJsonDoubleFactoryTest() override = default;
 
       void SetUp() override
       {}
@@ -26,9 +26,9 @@ namespace
       {}
   };
 
-  TEST_F(SerializableJSONDoubleFactoryTest, build)
+  TEST_F(SerializableJsonDoubleFactoryTest, build)
   {
-    std::shared_ptr<ls_std::Double> value = std::dynamic_pointer_cast<ls_std::Double>(ls_std::SerializableJSONDoubleFactory{}.build());
+    std::shared_ptr<ls_std::Double> value = std::dynamic_pointer_cast<ls_std::Double>(ls_std::SerializableJsonDoubleFactory{}.build());
     ASSERT_TRUE(value != nullptr);
     ASSERT_STREQ("Double", value->getClassName().c_str());
   }

test/cases/factory/serialization/json/boxing/SerializableJSONFloatFactoryTest.cpp → test/cases/factory/serialization/json/boxing/SerializableJsonFloatFactoryTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-25
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class SerializableJSONFloatFactoryTest : public ::testing::Test
+  class SerializableJsonFloatFactoryTest : public ::testing::Test
   {
     protected:
 
-      SerializableJSONFloatFactoryTest() = default;
-      ~SerializableJSONFloatFactoryTest() override = default;
+      SerializableJsonFloatFactoryTest() = default;
+      ~SerializableJsonFloatFactoryTest() override = default;
 
       void SetUp() override
       {}
@@ -26,9 +26,9 @@ namespace
       {}
   };
 
-  TEST_F(SerializableJSONFloatFactoryTest, build)
+  TEST_F(SerializableJsonFloatFactoryTest, build)
   {
-    std::shared_ptr<ls_std::Float> value = std::dynamic_pointer_cast<ls_std::Float>(ls_std::SerializableJSONFloatFactory{}.build());
+    std::shared_ptr<ls_std::Float> value = std::dynamic_pointer_cast<ls_std::Float>(ls_std::SerializableJsonFloatFactory{}.build());
     ASSERT_TRUE(value != nullptr);
     ASSERT_STREQ("Float", value->getClassName().c_str());
   }

test/cases/factory/serialization/json/boxing/SerializableJSONIntegerFactoryTest.cpp → test/cases/factory/serialization/json/boxing/SerializableJsonIntegerFactoryTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-25
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class SerializableJSONIntegerFactoryTest : public ::testing::Test
+  class SerializableJsonIntegerFactoryTest : public ::testing::Test
   {
     protected:
 
-      SerializableJSONIntegerFactoryTest() = default;
-      ~SerializableJSONIntegerFactoryTest() override = default;
+      SerializableJsonIntegerFactoryTest() = default;
+      ~SerializableJsonIntegerFactoryTest() override = default;
 
       void SetUp() override
       {}
@@ -26,9 +26,9 @@ namespace
       {}
   };
 
-  TEST_F(SerializableJSONIntegerFactoryTest, build)
+  TEST_F(SerializableJsonIntegerFactoryTest, build)
   {
-    std::shared_ptr<ls_std::Integer> value = std::dynamic_pointer_cast<ls_std::Integer>(ls_std::SerializableJSONIntegerFactory{}.build());
+    std::shared_ptr<ls_std::Integer> value = std::dynamic_pointer_cast<ls_std::Integer>(ls_std::SerializableJsonIntegerFactory{}.build());
     ASSERT_TRUE(value != nullptr);
     ASSERT_STREQ("Integer", value->getClassName().c_str());
   }

test/cases/factory/serialization/json/boxing/SerializableJSONLongFactoryTest.cpp → test/cases/factory/serialization/json/boxing/SerializableJsonLongFactoryTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-25
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class SerializableJSONLongFactoryTest : public ::testing::Test
+  class SerializableJsonLongFactoryTest : public ::testing::Test
   {
     protected:
 
-      SerializableJSONLongFactoryTest() = default;
-      ~SerializableJSONLongFactoryTest() override = default;
+      SerializableJsonLongFactoryTest() = default;
+      ~SerializableJsonLongFactoryTest() override = default;
 
       void SetUp() override
       {}
@@ -26,9 +26,9 @@ namespace
       {}
   };
 
-  TEST_F(SerializableJSONLongFactoryTest, build)
+  TEST_F(SerializableJsonLongFactoryTest, build)
   {
-    std::shared_ptr<ls_std::Long> value = std::dynamic_pointer_cast<ls_std::Long>(ls_std::SerializableJSONLongFactory{}.build());
+    std::shared_ptr<ls_std::Long> value = std::dynamic_pointer_cast<ls_std::Long>(ls_std::SerializableJsonLongFactory{}.build());
     ASSERT_TRUE(value != nullptr);
     ASSERT_STREQ("Long", value->getClassName().c_str());
   }

test/cases/factory/serialization/json/boxing/SerializableJSONStringFactoryTest.cpp → test/cases/factory/serialization/json/boxing/SerializableJsonStringFactoryTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-25
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class SerializableJSONStringFactoryTest : public ::testing::Test
+  class SerializableJsonStringFactoryTest : public ::testing::Test
   {
     protected:
 
-      SerializableJSONStringFactoryTest() = default;
-      ~SerializableJSONStringFactoryTest() override = default;
+      SerializableJsonStringFactoryTest() = default;
+      ~SerializableJsonStringFactoryTest() override = default;
 
       void SetUp() override
       {}
@@ -26,9 +26,9 @@ namespace
       {}
   };
 
-  TEST_F(SerializableJSONStringFactoryTest, build)
+  TEST_F(SerializableJsonStringFactoryTest, build)
   {
-    std::shared_ptr<ls_std::String> value = std::dynamic_pointer_cast<ls_std::String>(ls_std::SerializableJSONStringFactory{}.build());
+    std::shared_ptr<ls_std::String> value = std::dynamic_pointer_cast<ls_std::String>(ls_std::SerializableJsonStringFactory{}.build());
     ASSERT_TRUE(value != nullptr);
     ASSERT_STREQ("String", value->getClassName().c_str());
   }

test/cases/factory/serialization/json/event/SerializableJSONEventFactoryTest.cpp → test/cases/factory/serialization/json/event/SerializableJsonEventFactoryTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-30
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class SerializableJSONEventFactoryTest : public ::testing::Test
+  class SerializableJsonEventFactoryTest : public ::testing::Test
   {
     protected:
 
-      SerializableJSONEventFactoryTest() = default;
-      ~SerializableJSONEventFactoryTest() override = default;
+      SerializableJsonEventFactoryTest() = default;
+      ~SerializableJsonEventFactoryTest() override = default;
 
       void SetUp() override
       {}
@@ -26,9 +26,9 @@ namespace
       {}
   };
 
-  TEST_F(SerializableJSONEventFactoryTest, build)
+  TEST_F(SerializableJsonEventFactoryTest, build)
   {
-    std::shared_ptr<ls_std::Event> value = std::dynamic_pointer_cast<ls_std::Event>(ls_std::SerializableJSONEventFactory{}.build());
+    std::shared_ptr<ls_std::Event> value = std::dynamic_pointer_cast<ls_std::Event>(ls_std::SerializableJsonEventFactory{}.build());
     ASSERT_TRUE(value != nullptr);
     ASSERT_STREQ("Event", value->getClassName().c_str());
   }

test/cases/logic/StateTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-05
- * Changed:         2021-04-30
+ * Changed:         2021-05-02
  *
  * */
 
@@ -32,7 +32,7 @@ namespace
   TEST_F(StateTest, marshal)
   {
     std::shared_ptr<ls_std::State> state = std::make_shared<ls_std::State>("A");
-    std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJSONState>(state);
+    std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJsonState>(state);
     state->setSerializable(serializable);
 
     ASSERT_FALSE(state->marshal().empty());
@@ -57,7 +57,7 @@ namespace
   TEST_F(StateTest, unmarshal)
   {
     std::shared_ptr<ls_std::State> state = std::make_shared<ls_std::State>("TMP_ID");
-    std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJSONState>(state);
+    std::shared_ptr<ls_std::ISerializable> serializable = std::make_shared<ls_std::SerializableJsonState>(state);
     state->setSerializable(serializable);
     std::string jsonString = R"({"id":"A","connectedStates":{"AB":{"condition":false,"connectionId":"AB","stateId":"B"}}})";
     state->unmarshal(jsonString);

test/cases/serialization/json/JSONTest.cpp → test/cases/serialization/json/JsonTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class JSONTest : public ::testing::Test
+  class JsonTest : public ::testing::Test
   {
     protected:
 
-      JSONTest() = default;
-      ~JSONTest() override = default;
+      JsonTest() = default;
+      ~JsonTest() override = default;
 
       void SetUp() override
       {}
@@ -26,7 +26,7 @@ namespace
       {}
   };
 
-  TEST_F(JSONTest, simpleSerialization)
+  TEST_F(JsonTest, simpleSerialization)
   {
     nlohmann::json jsonObject{};
     jsonObject["value"] = 1989;

test/cases/serialization/json/boxing/SerializableJSONBooleanTest.cpp → test/cases/serialization/json/boxing/SerializableJsonBooleanTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-04
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class SerializableJSONBooleanTest : public ::testing::Test
+  class SerializableJsonBooleanTest : public ::testing::Test
   {
     protected:
 
-      SerializableJSONBooleanTest() = default;
-      ~SerializableJSONBooleanTest() override = default;
+      SerializableJsonBooleanTest() = default;
+      ~SerializableJsonBooleanTest() override = default;
 
       void SetUp() override
       {}
@@ -26,39 +26,39 @@ namespace
       {}
   };
 
-  TEST_F(SerializableJSONBooleanTest, marshal)
+  TEST_F(SerializableJsonBooleanTest, marshal)
   {
     ls_std::Boolean x{true};
-    ls_std::SerializableJSONBoolean serializable{std::make_shared<ls_std::Boolean>(x)};
+    ls_std::SerializableJsonBoolean serializable{std::make_shared<ls_std::Boolean>(x)};
     ls_std::String jsonString{serializable.marshal()};
 
     ASSERT_TRUE(jsonString.contains(R"({"value":true)"));
   }
 
-  TEST_F(SerializableJSONBooleanTest, unmarshal)
+  TEST_F(SerializableJsonBooleanTest, unmarshal)
   {
     std::shared_ptr<ls_std::Boolean> x = std::make_shared<ls_std::Boolean>(false);
 
     ASSERT_FALSE(*x);
 
-    ls_std::SerializableJSONBoolean serializable{x};
+    ls_std::SerializableJsonBoolean serializable{x};
     serializable.unmarshal(R"({"value":true})");
 
     ASSERT_TRUE(*x);
   }
 
-  TEST_F(SerializableJSONBooleanTest, getValue)
+  TEST_F(SerializableJsonBooleanTest, getValue)
   {
     std::shared_ptr<ls_std::Boolean> x = std::make_shared<ls_std::Boolean>(false);
-    ls_std::SerializableJSONBoolean serializable{x};
+    ls_std::SerializableJsonBoolean serializable{x};
 
     ASSERT_TRUE(serializable.getValue() == x);
   }
 
-  TEST_F(SerializableJSONBooleanTest, setValue)
+  TEST_F(SerializableJsonBooleanTest, setValue)
   {
     std::shared_ptr<ls_std::Boolean> x = std::make_shared<ls_std::Boolean>(false);
-    ls_std::SerializableJSONBoolean serializable{x};
+    ls_std::SerializableJsonBoolean serializable{x};
     ASSERT_TRUE(serializable.getValue() == x);
 
     x = std::make_shared<ls_std::Boolean>(true);

test/cases/serialization/json/boxing/SerializableJSONDoubleTest.cpp → test/cases/serialization/json/boxing/SerializableJsonDoubleTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-04
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class SerializableJSONDoubleTest : public ::testing::Test
+  class SerializableJsonDoubleTest : public ::testing::Test
   {
     protected:
 
-      SerializableJSONDoubleTest() = default;
-      ~SerializableJSONDoubleTest() override = default;
+      SerializableJsonDoubleTest() = default;
+      ~SerializableJsonDoubleTest() override = default;
 
       void SetUp() override
       {}
@@ -26,38 +26,38 @@ namespace
       {}
   };
 
-  TEST_F(SerializableJSONDoubleTest, marshal)
+  TEST_F(SerializableJsonDoubleTest, marshal)
   {
     ls_std::Double x{3.14159};
-    ls_std::SerializableJSONDouble serializable{std::make_shared<ls_std::Double>(x)};
+    ls_std::SerializableJsonDouble serializable{std::make_shared<ls_std::Double>(x)};
     ls_std::String jsonString{serializable.marshal()};
 
     ASSERT_TRUE(jsonString.contains(R"({"value":3.14159)"));
   }
 
-  TEST_F(SerializableJSONDoubleTest, unmarshal)
+  TEST_F(SerializableJsonDoubleTest, unmarshal)
   {
     std::shared_ptr<ls_std::Double> x = std::make_shared<ls_std::Double>(14.2234);
 
     ASSERT_DOUBLE_EQ(14.2234, *x);
 
-    ls_std::SerializableJSONDouble serializable{x};
+    ls_std::SerializableJsonDouble serializable{x};
     serializable.unmarshal(R"({"value":3.14159})");
 
     ASSERT_DOUBLE_EQ(3.14159, *x);
   }
 
-  TEST_F(SerializableJSONDoubleTest, getValue)
+  TEST_F(SerializableJsonDoubleTest, getValue)
   {
     std::shared_ptr<ls_std::Double> x = std::make_shared<ls_std::Double>(14.2234);
-    ls_std::SerializableJSONDouble serializable{x};
+    ls_std::SerializableJsonDouble serializable{x};
     ASSERT_TRUE(serializable.getValue() == x);
   }
 
-  TEST_F(SerializableJSONDoubleTest, setValue)
+  TEST_F(SerializableJsonDoubleTest, setValue)
   {
     std::shared_ptr<ls_std::Double> x = std::make_shared<ls_std::Double>(14.2234);
-    ls_std::SerializableJSONDouble serializable{x};
+    ls_std::SerializableJsonDouble serializable{x};
     ASSERT_TRUE(serializable.getValue() == x);
 
     x = std::make_shared<ls_std::Double>(3.145);

test/cases/serialization/json/boxing/SerializableJSONFloatTest.cpp → test/cases/serialization/json/boxing/SerializableJsonFloatTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-04
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class SerializableJSONFloatTest : public ::testing::Test
+  class SerializableJsonFloatTest : public ::testing::Test
   {
     protected:
 
-      SerializableJSONFloatTest() = default;
-      ~SerializableJSONFloatTest() override = default;
+      SerializableJsonFloatTest() = default;
+      ~SerializableJsonFloatTest() override = default;
 
       void SetUp() override
       {}
@@ -26,37 +26,37 @@ namespace
       {}
   };
 
-  TEST_F(SerializableJSONFloatTest, marshal)
+  TEST_F(SerializableJsonFloatTest, marshal)
   {
     ls_std::Float x{3.14159f};
-    ls_std::SerializableJSONFloat serializable{std::make_shared<ls_std::Float>(x)};
+    ls_std::SerializableJsonFloat serializable{std::make_shared<ls_std::Float>(x)};
     ls_std::String jsonString{serializable.marshal()};
 
     ASSERT_TRUE(jsonString.contains(R"({"value":3.14159)"));
   }
 
-  TEST_F(SerializableJSONFloatTest, unmarshal)
+  TEST_F(SerializableJsonFloatTest, unmarshal)
   {
     std::shared_ptr<ls_std::Float> x = std::make_shared<ls_std::Float>(14.2234f);
     ASSERT_FLOAT_EQ(14.2234f, *x);
 
-    ls_std::SerializableJSONFloat serializable{x};
+    ls_std::SerializableJsonFloat serializable{x};
     serializable.unmarshal(R"({"value":3.14159})");
 
     ASSERT_FLOAT_EQ(3.14159f, *x);
   }
 
-  TEST_F(SerializableJSONFloatTest, getValue)
+  TEST_F(SerializableJsonFloatTest, getValue)
   {
     std::shared_ptr<ls_std::Float> x = std::make_shared<ls_std::Float>(14.2234f);
-    ls_std::SerializableJSONFloat serializable{x};
+    ls_std::SerializableJsonFloat serializable{x};
     ASSERT_TRUE(serializable.getValue() == x);
   }
 
-  TEST_F(SerializableJSONFloatTest, setValue)
+  TEST_F(SerializableJsonFloatTest, setValue)
   {
     std::shared_ptr<ls_std::Float> x = std::make_shared<ls_std::Float>(14.2234f);
-    ls_std::SerializableJSONFloat serializable{x};
+    ls_std::SerializableJsonFloat serializable{x};
     ASSERT_TRUE(serializable.getValue() == x);
 
     x = std::make_shared<ls_std::Float>(3.134f);

test/cases/serialization/json/boxing/SerializableJSONIntegerTest.cpp → test/cases/serialization/json/boxing/SerializableJsonIntegerTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-21
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class SerializableJSONIntegerTest : public ::testing::Test
+  class SerializableJsonIntegerTest : public ::testing::Test
   {
     protected:
 
-      SerializableJSONIntegerTest() = default;
-      ~SerializableJSONIntegerTest() override = default;
+      SerializableJsonIntegerTest() = default;
+      ~SerializableJsonIntegerTest() override = default;
 
       void SetUp() override
       {}
@@ -26,37 +26,37 @@ namespace
       {}
   };
 
-  TEST_F(SerializableJSONIntegerTest, marshal)
+  TEST_F(SerializableJsonIntegerTest, marshal)
   {
     ls_std::Integer x{3};
-    ls_std::SerializableJSONInteger serializable{std::make_shared<ls_std::Integer>(x)};
+    ls_std::SerializableJsonInteger serializable{std::make_shared<ls_std::Integer>(x)};
     ls_std::byte_field content = serializable.marshal();
 
     ASSERT_STREQ(R"({"value":3})", content.c_str());
   }
 
-  TEST_F(SerializableJSONIntegerTest, unmarshal)
+  TEST_F(SerializableJsonIntegerTest, unmarshal)
   {
     std::shared_ptr<ls_std::Integer> x = std::make_shared<ls_std::Integer>(13);
     ASSERT_EQ(13, *x);
 
-    ls_std::SerializableJSONInteger serializable{x};
+    ls_std::SerializableJsonInteger serializable{x};
     serializable.unmarshal(R"({"value":1989})");
 
     ASSERT_EQ(1989, *x);
   }
 
-  TEST_F(SerializableJSONIntegerTest, getValue)
+  TEST_F(SerializableJsonIntegerTest, getValue)
   {
     std::shared_ptr<ls_std::Integer> x = std::make_shared<ls_std::Integer>(13);
-    ls_std::SerializableJSONInteger serializable{x};
+    ls_std::SerializableJsonInteger serializable{x};
     ASSERT_TRUE(serializable.getValue() == x);
   }
 
-  TEST_F(SerializableJSONIntegerTest, setValue)
+  TEST_F(SerializableJsonIntegerTest, setValue)
   {
     std::shared_ptr<ls_std::Integer> x = std::make_shared<ls_std::Integer>(13);
-    ls_std::SerializableJSONInteger serializable{x};
+    ls_std::SerializableJsonInteger serializable{x};
     ASSERT_TRUE(serializable.getValue() == x);
 
     x = std::make_shared<ls_std::Integer>(25);

test/cases/serialization/json/boxing/SerializableJSONLongTest.cpp → test/cases/serialization/json/boxing/SerializableJsonLongTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-26
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class SerializableJSONLongTest : public ::testing::Test
+  class SerializableJsonLongTest : public ::testing::Test
   {
     protected:
 
-      SerializableJSONLongTest() = default;
-      ~SerializableJSONLongTest() override = default;
+      SerializableJsonLongTest() = default;
+      ~SerializableJsonLongTest() override = default;
 
       void SetUp() override
       {}
@@ -26,37 +26,37 @@ namespace
       {}
   };
 
-  TEST_F(SerializableJSONLongTest, marshal)
+  TEST_F(SerializableJsonLongTest, marshal)
   {
     ls_std::Long x{(ls_std::long_type) 31983771009271};
-    ls_std::SerializableJSONLong serializable{std::make_shared<ls_std::Long>(x)};
+    ls_std::SerializableJsonLong serializable{std::make_shared<ls_std::Long>(x)};
     ls_std::byte_field content = serializable.marshal();
 
     ASSERT_STREQ(R"({"value":31983771009271})", content.c_str());
   }
 
-  TEST_F(SerializableJSONLongTest, unmarshal)
+  TEST_F(SerializableJsonLongTest, unmarshal)
   {
     std::shared_ptr<ls_std::Long> x = std::make_shared<ls_std::Long>(31983771009271);
     ASSERT_EQ(31983771009271, *x);
 
-    ls_std::SerializableJSONLong serializable{x};
+    ls_std::SerializableJsonLong serializable{x};
     serializable.unmarshal(R"({"value":1989})");
 
     ASSERT_EQ(1989, *x);
   }
 
-  TEST_F(SerializableJSONLongTest, getValue)
+  TEST_F(SerializableJsonLongTest, getValue)
   {
     std::shared_ptr<ls_std::Long> x = std::make_shared<ls_std::Long>(31983771009271);
-    ls_std::SerializableJSONLong serializable{x};
+    ls_std::SerializableJsonLong serializable{x};
     ASSERT_TRUE(serializable.getValue() == x);
   }
 
-  TEST_F(SerializableJSONLongTest, setValue)
+  TEST_F(SerializableJsonLongTest, setValue)
   {
     std::shared_ptr<ls_std::Long> x = std::make_shared<ls_std::Long>(31983771009271);
-    ls_std::SerializableJSONLong serializable{x};
+    ls_std::SerializableJsonLong serializable{x};
     ASSERT_TRUE(serializable.getValue() == x);
 
     x = std::make_shared<ls_std::Long>(31983771009221);

test/cases/serialization/json/boxing/SerializableJSONStringTest.cpp → test/cases/serialization/json/boxing/SerializableJsonStringTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-30
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class SerializableJSONStringTest : public ::testing::Test
+  class SerializableJsonStringTest : public ::testing::Test
   {
     protected:
 
-      SerializableJSONStringTest() = default;
-      ~SerializableJSONStringTest() override = default;
+      SerializableJsonStringTest() = default;
+      ~SerializableJsonStringTest() override = default;
 
       void SetUp() override
       {}
@@ -26,37 +26,37 @@ namespace
       {}
   };
 
-  TEST_F(SerializableJSONStringTest, marshal)
+  TEST_F(SerializableJsonStringTest, marshal)
   {
     ls_std::String x{"Testing something!"};
-    ls_std::SerializableJSONString serializable{std::make_shared<ls_std::String>(x)};
+    ls_std::SerializableJsonString serializable{std::make_shared<ls_std::String>(x)};
     ls_std::byte_field content = serializable.marshal();
 
     ASSERT_STREQ(R"({"value":"Testing something!"})", content.c_str());
   }
 
-  TEST_F(SerializableJSONStringTest, unmarshal)
+  TEST_F(SerializableJsonStringTest, unmarshal)
   {
     std::shared_ptr<ls_std::String> x = std::make_shared<ls_std::String>("Hello!");
     ASSERT_STREQ("Hello!", *x);
 
-    ls_std::SerializableJSONString serializable{x};
+    ls_std::SerializableJsonString serializable{x};
     serializable.unmarshal(R"({"value":"Ups!"})");
 
     ASSERT_STREQ("Ups!", *x);
   }
 
-  TEST_F(SerializableJSONStringTest, getValue)
+  TEST_F(SerializableJsonStringTest, getValue)
   {
     std::shared_ptr<ls_std::String> x = std::make_shared<ls_std::String>("Hello!");
-    ls_std::SerializableJSONString serializable{x};
+    ls_std::SerializableJsonString serializable{x};
     ASSERT_TRUE(serializable.getValue() == x);
   }
 
-  TEST_F(SerializableJSONStringTest, setValue)
+  TEST_F(SerializableJsonStringTest, setValue)
   {
     std::shared_ptr<ls_std::String> x = std::make_shared<ls_std::String>("Hello!");
-    ls_std::SerializableJSONString serializable{x};
+    ls_std::SerializableJsonString serializable{x};
     ASSERT_TRUE(serializable.getValue() == x);
 
     x = std::make_shared<ls_std::String>("Hello again!");

test/cases/serialization/json/event/SerializableJSONEventTest.cpp → test/cases/serialization/json/event/SerializableJsonEventTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-20
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class SerializableJSONEventTest : public ::testing::Test
+  class SerializableJsonEventTest : public ::testing::Test
   {
     protected:
 
-      SerializableJSONEventTest() = default;
-      ~SerializableJSONEventTest() override = default;
+      SerializableJsonEventTest() = default;
+      ~SerializableJsonEventTest() override = default;
 
       void SetUp() override
       {}
@@ -26,13 +26,13 @@ namespace
       {}
   };
 
-  TEST_F(SerializableJSONEventTest, marshal)
+  TEST_F(SerializableJsonEventTest, marshal)
   {
     ls_std::Event event{"OPEN_DOOR_EVENT"};
     event.addParameter(ls_std::event_parameter{"key_available", "true"});
     event.addParameter(ls_std::event_parameter{"door_id", "16675"});
 
-    ls_std::SerializableJSONEvent serializable{std::make_shared<ls_std::Event>(event)};
+    ls_std::SerializableJsonEvent serializable{std::make_shared<ls_std::Event>(event)};
 
     ls_std::byte_field data = serializable.marshal();
     ASSERT_FALSE(data.empty());
@@ -40,10 +40,10 @@ namespace
     ASSERT_STREQ(expectedString.c_str(), data.c_str());
   }
 
-  TEST_F(SerializableJSONEventTest, unmarshal)
+  TEST_F(SerializableJsonEventTest, unmarshal)
   {
     ls_std::Event event{"TMP_EVENT"};
-    ls_std::SerializableJSONEvent serializable{std::make_shared<ls_std::Event>(event)};
+    ls_std::SerializableJsonEvent serializable{std::make_shared<ls_std::Event>(event)};
     std::string jsonString = R"({"id":"OPEN_DOOR_EVENT","parameterList":{"door_id":["door_id","16675"],"key_available":["key_available","true"]}})";
 
     serializable.unmarshal(jsonString);

test/cases/serialization/json/logic/SerializableJSONStateConnectionTest.cpp → test/cases/serialization/json/logic/SerializableJsonStateConnectionTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-14
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class SerializableJSONStateConnectionTest : public ::testing::Test
+  class SerializableJsonStateConnectionTest : public ::testing::Test
   {
     protected:
 
-      SerializableJSONStateConnectionTest() = default;
-      ~SerializableJSONStateConnectionTest() override = default;
+      SerializableJsonStateConnectionTest() = default;
+      ~SerializableJsonStateConnectionTest() override = default;
 
       void SetUp() override
       {}
@@ -28,23 +28,23 @@ namespace
 
   // implementation
 
-  TEST_F(SerializableJSONStateConnectionTest, marshal)
+  TEST_F(SerializableJsonStateConnectionTest, marshal)
   {
     ls_std::StateConnection x{"AB", "B"};
-    ls_std::SerializableJSONStateConnection serializable{std::make_shared<ls_std::StateConnection>(x)};
+    ls_std::SerializableJsonStateConnection serializable{std::make_shared<ls_std::StateConnection>(x)};
     ls_std::String jsonString{serializable.marshal()};
 
     ASSERT_STREQ(R"({"condition":false,"connectionId":"AB","stateId":"B"})", jsonString.toString().c_str());
   }
 
-  TEST_F(SerializableJSONStateConnectionTest, unmarshal)
+  TEST_F(SerializableJsonStateConnectionTest, unmarshal)
   {
     std::shared_ptr<ls_std::StateConnection> x = std::make_shared<ls_std::StateConnection>("AB", "B");
     ASSERT_STREQ("AB", x->getConnectionId().c_str());
     ASSERT_STREQ("B", x->getStateId().c_str());
     ASSERT_FALSE(x->isPassable());
 
-    ls_std::SerializableJSONStateConnection serializable{x};
+    ls_std::SerializableJsonStateConnection serializable{x};
     serializable.unmarshal(R"({"condition":true,"connectionId":"BC","stateId":"C"})");
 
     ASSERT_STREQ("BC", x->getConnectionId().c_str());
@@ -52,17 +52,17 @@ namespace
     ASSERT_TRUE(x->isPassable());
   }
 
-  TEST_F(SerializableJSONStateConnectionTest, getValue)
+  TEST_F(SerializableJsonStateConnectionTest, getValue)
   {
     std::shared_ptr<ls_std::StateConnection> x = std::make_shared<ls_std::StateConnection>("AB", "B");
-    ls_std::SerializableJSONStateConnection serializable{x};
+    ls_std::SerializableJsonStateConnection serializable{x};
     ASSERT_TRUE(serializable.getValue() == x);
   }
 
-  TEST_F(SerializableJSONStateConnectionTest, setValue)
+  TEST_F(SerializableJsonStateConnectionTest, setValue)
   {
     ls_std::StateConnection x{"AB", "B"};
-    ls_std::SerializableJSONStateConnection serializable{std::make_shared<ls_std::StateConnection>(x)};
+    ls_std::SerializableJsonStateConnection serializable{std::make_shared<ls_std::StateConnection>(x)};
     ls_std::String jsonString{serializable.marshal()};
 
     ASSERT_STREQ(R"({"condition":false,"connectionId":"AB","stateId":"B"})", jsonString.toString().c_str());

test/cases/serialization/json/logic/SerializableJSONStateMachineTest.cpp → test/cases/serialization/json/logic/SerializableJsonStateMachineTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-17
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -14,12 +14,12 @@
 
 namespace
 {
-  class SerializableJSONStateMachineTest : public ::testing::Test
+  class SerializableJsonStateMachineTest : public ::testing::Test
   {
     protected:
 
-      SerializableJSONStateMachineTest() = default;
-      ~SerializableJSONStateMachineTest() override = default;
+      SerializableJsonStateMachineTest() = default;
+      ~SerializableJsonStateMachineTest() override = default;
 
       void SetUp() override
       {}
@@ -30,12 +30,12 @@ namespace
 
   // implementation
 
-  TEST_F(SerializableJSONStateMachineTest, marshal)
+  TEST_F(SerializableJsonStateMachineTest, marshal)
   {
     ls_std::StateMachine stateMachine = ls_std_test::TestDataFactory::createStateMachine();
     stateMachine.setStartState("A");
     stateMachine.setMemory({"A", "B", "C"});
-    ls_std::SerializableJSONStateMachine serializable{std::make_shared<ls_std::StateMachine>(stateMachine)};
+    ls_std::SerializableJsonStateMachine serializable{std::make_shared<ls_std::StateMachine>(stateMachine)};
 
     std::string jsonString = serializable.marshal();
     ASSERT_TRUE(!jsonString.empty());
@@ -47,12 +47,12 @@ namespace
     ASSERT_TRUE(data.contains(jsonString));
   }
 
-  TEST_F(SerializableJSONStateMachineTest, unmarshal)
+  TEST_F(SerializableJsonStateMachineTest, unmarshal)
   {
     ls_std::File file{TestHelper::getResourcesFolderLocation() + "/state_machine_test.json"};
     ls_std::FileReader reader{file};
     std::shared_ptr<ls_std::StateMachine> x = std::make_shared<ls_std::StateMachine>("bla");
-    ls_std::SerializableJSONStateMachine serializable{x};
+    ls_std::SerializableJsonStateMachine serializable{x};
 
     serializable.unmarshal(reader.read());
 
@@ -103,17 +103,17 @@ namespace
     ASSERT_TRUE(state->getConnectedStates().empty());
   }
 
-  TEST_F(SerializableJSONStateMachineTest, getValue)
+  TEST_F(SerializableJsonStateMachineTest, getValue)
   {
     std::shared_ptr<ls_std::StateMachine> x = std::make_shared<ls_std::StateMachine>("bla");
-    ls_std::SerializableJSONStateMachine serializable{x};
+    ls_std::SerializableJsonStateMachine serializable{x};
     ASSERT_TRUE(serializable.getValue() == x);
   }
 
-  TEST_F(SerializableJSONStateMachineTest, setValue)
+  TEST_F(SerializableJsonStateMachineTest, setValue)
   {
     std::shared_ptr<ls_std::StateMachine> x = std::make_shared<ls_std::StateMachine>("bla");
-    ls_std::SerializableJSONStateMachine serializable{x};
+    ls_std::SerializableJsonStateMachine serializable{x};
     ASSERT_TRUE(serializable.getValue() == x);
 
     x = std::make_shared<ls_std::StateMachine>("bla2");

test/cases/serialization/json/logic/SerializableJSONStateTest.cpp → test/cases/serialization/json/logic/SerializableJsonStateTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-15
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class SerializableJSONStateTest : public ::testing::Test
+  class SerializableJsonStateTest : public ::testing::Test
   {
     protected:
 
-      SerializableJSONStateTest() = default;
-      ~SerializableJSONStateTest() override = default;
+      SerializableJsonStateTest() = default;
+      ~SerializableJsonStateTest() override = default;
 
       void SetUp() override
       {}
@@ -26,24 +26,24 @@ namespace
       {}
   };
 
-  TEST_F(SerializableJSONStateTest, marshal)
+  TEST_F(SerializableJsonStateTest, marshal)
   {
     std::shared_ptr<ls_std::State> x = std::make_shared<ls_std::State>("A");
     x->addStateConnection(std::make_shared<ls_std::StateConnection>("AB", "B"));
     x->addStateConnection(std::make_shared<ls_std::StateConnection>("AC", "C"));
 
-    ls_std::SerializableJSONState serializable{x};
+    ls_std::SerializableJsonState serializable{x};
     ls_std::byte_field jsonString = serializable.marshal();
 
     ASSERT_TRUE(!jsonString.empty());
-    std::string expectedJSONString = R"({"connectedStates":{"AB":{"condition":false,"connectionId":"AB","stateId":"B"},"AC":{"condition":false,"connectionId":"AC","stateId":"C"}},"id":"A"})";
-    ASSERT_STREQ(expectedJSONString.c_str(), jsonString.c_str());
+    std::string expectedJson = R"({"connectedStates":{"AB":{"condition":false,"connectionId":"AB","stateId":"B"},"AC":{"condition":false,"connectionId":"AC","stateId":"C"}},"id":"A"})";
+    ASSERT_STREQ(expectedJson.c_str(), jsonString.c_str());
   }
 
-  TEST_F(SerializableJSONStateTest, unmarshal)
+  TEST_F(SerializableJsonStateTest, unmarshal)
   {
     std::shared_ptr<ls_std::State> x = std::make_shared<ls_std::State>("A");
-    ls_std::SerializableJSONState serializable{x};
+    ls_std::SerializableJsonState serializable{x};
 
     // before
 
@@ -62,24 +62,24 @@ namespace
     ASSERT_STREQ("B", x->getConnectedStates().at("AB")->getStateId().c_str());
   }
 
-  TEST_F(SerializableJSONStateTest, getValue)
+  TEST_F(SerializableJsonStateTest, getValue)
   {
     std::shared_ptr<ls_std::State> x = std::make_shared<ls_std::State>("A");
-    ls_std::SerializableJSONState serializable{x};
+    ls_std::SerializableJsonState serializable{x};
     ASSERT_TRUE(serializable.getValue() == x);
   }
 
-  TEST_F(SerializableJSONStateTest, setValue)
+  TEST_F(SerializableJsonStateTest, setValue)
   {
     std::shared_ptr<ls_std::State> x = std::make_shared<ls_std::State>("A");
     x->addStateConnection(std::make_shared<ls_std::StateConnection>("AB", "B"));
     x->addStateConnection(std::make_shared<ls_std::StateConnection>("AC", "C"));
 
-    ls_std::SerializableJSONState serializable{x};
+    ls_std::SerializableJsonState serializable{x};
     ls_std::byte_field jsonString = serializable.marshal();
 
-    std::string expectedJSONString = R"({"connectedStates":{"AB":{"condition":false,"connectionId":"AB","stateId":"B"},"AC":{"condition":false,"connectionId":"AC","stateId":"C"}},"id":"A"})";
-    ASSERT_STREQ(expectedJSONString.c_str(), jsonString.c_str());
+    std::string expectedJson = R"({"connectedStates":{"AB":{"condition":false,"connectionId":"AB","stateId":"B"},"AC":{"condition":false,"connectionId":"AC","stateId":"C"}},"id":"A"})";
+    ASSERT_STREQ(expectedJson.c_str(), jsonString.c_str());
 
     // setValue should now clear json