diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7f80cd..b39cedd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,8 +8,8 @@ enable_testing()
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-add_subdirectory(libs/GenericCore)
-set (CORE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/GenericCore)
+add_subdirectory(libs/BeetRoundCore)
+set (CORE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/BeetRoundCore)
 
 ### 3rd party libraries
 add_subdirectory(libs/3rdParty/Qt-QrCodeGenerator)
diff --git a/UIs/BeetRoundWidgets/CMakeLists.txt b/UIs/BeetRoundWidgets/CMakeLists.txt
index 56fe437..902fbb3 100644
--- a/UIs/BeetRoundWidgets/CMakeLists.txt
+++ b/UIs/BeetRoundWidgets/CMakeLists.txt
@@ -63,7 +63,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 target_link_libraries(${TARGET_APP} PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
 
 target_include_directories(${TARGET_APP} PRIVATE ${CORE_LIB_DIR}/)
-target_link_libraries(${TARGET_APP} PRIVATE GenericCore)
+target_link_libraries(${TARGET_APP} PRIVATE BeetRoundCore)
 target_include_directories(${TARGET_APP} PRIVATE ${QR_LIB_DIR}/src)
 target_link_libraries(${TARGET_APP} PRIVATE qrcode)
 
diff --git a/libs/GenericCore/GenericCore_en_US.ts b/libs/BeetRoundCore/BeetRoundCore_en_US.ts
similarity index 100%
rename from libs/GenericCore/GenericCore_en_US.ts
rename to libs/BeetRoundCore/BeetRoundCore_en_US.ts
diff --git a/libs/GenericCore/CMakeLists.txt b/libs/BeetRoundCore/CMakeLists.txt
similarity index 90%
rename from libs/GenericCore/CMakeLists.txt
rename to libs/BeetRoundCore/CMakeLists.txt
index 95cf9e6..11492df 100644
--- a/libs/GenericCore/CMakeLists.txt
+++ b/libs/BeetRoundCore/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 
-set(TARGET_APP "GenericCore")
+set(TARGET_APP "BeetRoundCore")
 project(${TARGET_APP} VERSION 0.1.0 LANGUAGES CXX)
 
 set(CMAKE_AUTOUIC ON)
@@ -43,8 +43,8 @@ add_library(${TARGET_APP} STATIC
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 target_link_libraries(${TARGET_APP} PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui)
-target_link_libraries(GenericCore PRIVATE Qt${QT_VERSION_MAJOR}::Test)
-target_link_libraries(GenericCore PRIVATE Qt${QT_VERSION_MAJOR}::Network)
+target_link_libraries(${TARGET_APP} PRIVATE Qt${QT_VERSION_MAJOR}::Test)
+target_link_libraries(${TARGET_APP} PRIVATE Qt${QT_VERSION_MAJOR}::Network)
 
 target_compile_definitions(${TARGET_APP} PRIVATE ${TARGET_APP}_LIBRARY)
 
diff --git a/libs/GenericCore/CoreConfig.h.in b/libs/BeetRoundCore/CoreConfig.h.in
similarity index 100%
rename from libs/GenericCore/CoreConfig.h.in
rename to libs/BeetRoundCore/CoreConfig.h.in
diff --git a/libs/GenericCore/constants.h b/libs/BeetRoundCore/constants.h
similarity index 100%
rename from libs/GenericCore/constants.h
rename to libs/BeetRoundCore/constants.h
diff --git a/libs/GenericCore/data/filehandler.cpp b/libs/BeetRoundCore/data/filehandler.cpp
similarity index 100%
rename from libs/GenericCore/data/filehandler.cpp
rename to libs/BeetRoundCore/data/filehandler.cpp
diff --git a/libs/GenericCore/data/filehandler.h b/libs/BeetRoundCore/data/filehandler.h
similarity index 100%
rename from libs/GenericCore/data/filehandler.h
rename to libs/BeetRoundCore/data/filehandler.h
diff --git a/libs/GenericCore/data/settingshandler.cpp b/libs/BeetRoundCore/data/settingshandler.cpp
similarity index 100%
rename from libs/GenericCore/data/settingshandler.cpp
rename to libs/BeetRoundCore/data/settingshandler.cpp
diff --git a/libs/GenericCore/data/settingshandler.h b/libs/BeetRoundCore/data/settingshandler.h
similarity index 100%
rename from libs/GenericCore/data/settingshandler.h
rename to libs/BeetRoundCore/data/settingshandler.h
diff --git a/libs/GenericCore/formats/csvparser.cpp b/libs/BeetRoundCore/formats/csvparser.cpp
similarity index 100%
rename from libs/GenericCore/formats/csvparser.cpp
rename to libs/BeetRoundCore/formats/csvparser.cpp
diff --git a/libs/GenericCore/formats/csvparser.h b/libs/BeetRoundCore/formats/csvparser.h
similarity index 100%
rename from libs/GenericCore/formats/csvparser.h
rename to libs/BeetRoundCore/formats/csvparser.h
diff --git a/libs/GenericCore/formats/jsonparser.cpp b/libs/BeetRoundCore/formats/jsonparser.cpp
similarity index 100%
rename from libs/GenericCore/formats/jsonparser.cpp
rename to libs/BeetRoundCore/formats/jsonparser.cpp
diff --git a/libs/GenericCore/formats/jsonparser.h b/libs/BeetRoundCore/formats/jsonparser.h
similarity index 100%
rename from libs/GenericCore/formats/jsonparser.h
rename to libs/BeetRoundCore/formats/jsonparser.h
diff --git a/libs/GenericCore/genericcore.cpp b/libs/BeetRoundCore/genericcore.cpp
similarity index 100%
rename from libs/GenericCore/genericcore.cpp
rename to libs/BeetRoundCore/genericcore.cpp
diff --git a/libs/GenericCore/genericcore.h b/libs/BeetRoundCore/genericcore.h
similarity index 100%
rename from libs/GenericCore/genericcore.h
rename to libs/BeetRoundCore/genericcore.h
diff --git a/libs/GenericCore/model/commands/edititemcommand.cpp b/libs/BeetRoundCore/model/commands/edititemcommand.cpp
similarity index 100%
rename from libs/GenericCore/model/commands/edititemcommand.cpp
rename to libs/BeetRoundCore/model/commands/edititemcommand.cpp
diff --git a/libs/GenericCore/model/commands/edititemcommand.h b/libs/BeetRoundCore/model/commands/edititemcommand.h
similarity index 100%
rename from libs/GenericCore/model/commands/edititemcommand.h
rename to libs/BeetRoundCore/model/commands/edititemcommand.h
diff --git a/libs/GenericCore/model/commands/insertrowscommand.cpp b/libs/BeetRoundCore/model/commands/insertrowscommand.cpp
similarity index 100%
rename from libs/GenericCore/model/commands/insertrowscommand.cpp
rename to libs/BeetRoundCore/model/commands/insertrowscommand.cpp
diff --git a/libs/GenericCore/model/commands/insertrowscommand.h b/libs/BeetRoundCore/model/commands/insertrowscommand.h
similarity index 100%
rename from libs/GenericCore/model/commands/insertrowscommand.h
rename to libs/BeetRoundCore/model/commands/insertrowscommand.h
diff --git a/libs/GenericCore/model/commands/removerowscommand.cpp b/libs/BeetRoundCore/model/commands/removerowscommand.cpp
similarity index 100%
rename from libs/GenericCore/model/commands/removerowscommand.cpp
rename to libs/BeetRoundCore/model/commands/removerowscommand.cpp
diff --git a/libs/GenericCore/model/commands/removerowscommand.h b/libs/BeetRoundCore/model/commands/removerowscommand.h
similarity index 100%
rename from libs/GenericCore/model/commands/removerowscommand.h
rename to libs/BeetRoundCore/model/commands/removerowscommand.h
diff --git a/libs/GenericCore/model/generalsortfiltermodel.cpp b/libs/BeetRoundCore/model/generalsortfiltermodel.cpp
similarity index 100%
rename from libs/GenericCore/model/generalsortfiltermodel.cpp
rename to libs/BeetRoundCore/model/generalsortfiltermodel.cpp
diff --git a/libs/GenericCore/model/generalsortfiltermodel.h b/libs/BeetRoundCore/model/generalsortfiltermodel.h
similarity index 100%
rename from libs/GenericCore/model/generalsortfiltermodel.h
rename to libs/BeetRoundCore/model/generalsortfiltermodel.h
diff --git a/libs/GenericCore/model/metadata.h b/libs/BeetRoundCore/model/metadata.h
similarity index 100%
rename from libs/GenericCore/model/metadata.h
rename to libs/BeetRoundCore/model/metadata.h
diff --git a/libs/GenericCore/model/modelitem.cpp b/libs/BeetRoundCore/model/modelitem.cpp
similarity index 100%
rename from libs/GenericCore/model/modelitem.cpp
rename to libs/BeetRoundCore/model/modelitem.cpp
diff --git a/libs/GenericCore/model/modelitem.h b/libs/BeetRoundCore/model/modelitem.h
similarity index 100%
rename from libs/GenericCore/model/modelitem.h
rename to libs/BeetRoundCore/model/modelitem.h
diff --git a/libs/GenericCore/model/tablemodel.cpp b/libs/BeetRoundCore/model/tablemodel.cpp
similarity index 100%
rename from libs/GenericCore/model/tablemodel.cpp
rename to libs/BeetRoundCore/model/tablemodel.cpp
diff --git a/libs/GenericCore/model/tablemodel.h b/libs/BeetRoundCore/model/tablemodel.h
similarity index 100%
rename from libs/GenericCore/model/tablemodel.h
rename to libs/BeetRoundCore/model/tablemodel.h
diff --git a/libs/GenericCore/network/apiroutes.h b/libs/BeetRoundCore/network/apiroutes.h
similarity index 100%
rename from libs/GenericCore/network/apiroutes.h
rename to libs/BeetRoundCore/network/apiroutes.h
diff --git a/libs/GenericCore/network/servercommunicator.cpp b/libs/BeetRoundCore/network/servercommunicator.cpp
similarity index 100%
rename from libs/GenericCore/network/servercommunicator.cpp
rename to libs/BeetRoundCore/network/servercommunicator.cpp
diff --git a/libs/GenericCore/network/servercommunicator.h b/libs/BeetRoundCore/network/servercommunicator.h
similarity index 100%
rename from libs/GenericCore/network/servercommunicator.h
rename to libs/BeetRoundCore/network/servercommunicator.h
diff --git a/tests/GenericCoreTests/CMakeLists.txt b/tests/GenericCoreTests/CMakeLists.txt
index 21d44fe..a623e1a 100644
--- a/tests/GenericCoreTests/CMakeLists.txt
+++ b/tests/GenericCoreTests/CMakeLists.txt
@@ -24,7 +24,7 @@ target_include_directories(${TARGET_APP} PRIVATE ${CORE_LIB_DIR}/include)
 target_link_libraries(${TARGET_APP}
   PRIVATE
   GTest::GTest
-  GenericCore)
+  BeetRoundCore)
 target_link_libraries(${TARGET_APP} PUBLIC Qt${QT_VERSION_MAJOR}::Core)
 
 add_test(core_gtests ${TARGET_APP})
diff --git a/tests/GenericCoreTests/core_test.cpp b/tests/GenericCoreTests/core_test.cpp
index 8d54953..a4a2b70 100644
--- a/tests/GenericCoreTests/core_test.cpp
+++ b/tests/GenericCoreTests/core_test.cpp
@@ -2,7 +2,7 @@
 
 #include <QString>
 
-#include "../../libs/GenericCore/genericcore.h"
+#include "../../libs/BeetRoundCore/genericcore.h"
 
 QT_BEGIN_NAMESPACE
 inline void PrintTo(const QString& qString, ::std::ostream* os) { *os << qUtf8Printable(qString); }