diff --git a/CMakeLists.txt b/CMakeLists.txt
index e47c6dd..b7f80cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ set (QR_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdParty/Qt-QrCodeGenerator)
 configure_file(ApplicationConfig.h.in ApplicationConfig.h)
 
 #Frontend applications
-add_subdirectory(UIs/GenericWidgets)
+add_subdirectory(UIs/BeetRoundWidgets)
 
 ### Tests
 add_subdirectory(tests/GenericCoreTests)
diff --git a/UIs/GenericWidgets/.gitignore b/UIs/BeetRoundWidgets/.gitignore
similarity index 100%
rename from UIs/GenericWidgets/.gitignore
rename to UIs/BeetRoundWidgets/.gitignore
diff --git a/UIs/GenericWidgets/BeetRound-Widgets_en_US.ts b/UIs/BeetRoundWidgets/BeetRound-Widgets_en_US.ts
similarity index 100%
rename from UIs/GenericWidgets/BeetRound-Widgets_en_US.ts
rename to UIs/BeetRoundWidgets/BeetRound-Widgets_en_US.ts
diff --git a/UIs/GenericWidgets/CMakeLists.txt b/UIs/BeetRoundWidgets/CMakeLists.txt
similarity index 100%
rename from UIs/GenericWidgets/CMakeLists.txt
rename to UIs/BeetRoundWidgets/CMakeLists.txt
diff --git a/UIs/GenericWidgets/assets/feature.png b/UIs/BeetRoundWidgets/assets/feature.png
similarity index 100%
rename from UIs/GenericWidgets/assets/feature.png
rename to UIs/BeetRoundWidgets/assets/feature.png
diff --git a/UIs/GenericWidgets/assets/icons.qrc b/UIs/BeetRoundWidgets/assets/icons.qrc
similarity index 100%
rename from UIs/GenericWidgets/assets/icons.qrc
rename to UIs/BeetRoundWidgets/assets/icons.qrc
diff --git a/UIs/GenericWidgets/assets/no-picture-taking.png b/UIs/BeetRoundWidgets/assets/no-picture-taking.png
similarity index 100%
rename from UIs/GenericWidgets/assets/no-picture-taking.png
rename to UIs/BeetRoundWidgets/assets/no-picture-taking.png
diff --git a/UIs/GenericWidgets/assets/software-application.png b/UIs/BeetRoundWidgets/assets/software-application.png
similarity index 100%
rename from UIs/GenericWidgets/assets/software-application.png
rename to UIs/BeetRoundWidgets/assets/software-application.png
diff --git a/UIs/GenericWidgets/assets/urls.txt b/UIs/BeetRoundWidgets/assets/urls.txt
similarity index 100%
rename from UIs/GenericWidgets/assets/urls.txt
rename to UIs/BeetRoundWidgets/assets/urls.txt
diff --git a/UIs/GenericWidgets/dialogs/abstractdialog.cpp b/UIs/BeetRoundWidgets/dialogs/abstractdialog.cpp
similarity index 100%
rename from UIs/GenericWidgets/dialogs/abstractdialog.cpp
rename to UIs/BeetRoundWidgets/dialogs/abstractdialog.cpp
diff --git a/UIs/GenericWidgets/dialogs/abstractdialog.h b/UIs/BeetRoundWidgets/dialogs/abstractdialog.h
similarity index 100%
rename from UIs/GenericWidgets/dialogs/abstractdialog.h
rename to UIs/BeetRoundWidgets/dialogs/abstractdialog.h
diff --git a/UIs/GenericWidgets/dialogs/edititemdialog.cpp b/UIs/BeetRoundWidgets/dialogs/edititemdialog.cpp
similarity index 100%
rename from UIs/GenericWidgets/dialogs/edititemdialog.cpp
rename to UIs/BeetRoundWidgets/dialogs/edititemdialog.cpp
diff --git a/UIs/GenericWidgets/dialogs/edititemdialog.h b/UIs/BeetRoundWidgets/dialogs/edititemdialog.h
similarity index 100%
rename from UIs/GenericWidgets/dialogs/edititemdialog.h
rename to UIs/BeetRoundWidgets/dialogs/edititemdialog.h
diff --git a/UIs/GenericWidgets/dialogs/newitemdialog.cpp b/UIs/BeetRoundWidgets/dialogs/newitemdialog.cpp
similarity index 100%
rename from UIs/GenericWidgets/dialogs/newitemdialog.cpp
rename to UIs/BeetRoundWidgets/dialogs/newitemdialog.cpp
diff --git a/UIs/GenericWidgets/dialogs/newitemdialog.h b/UIs/BeetRoundWidgets/dialogs/newitemdialog.h
similarity index 100%
rename from UIs/GenericWidgets/dialogs/newitemdialog.h
rename to UIs/BeetRoundWidgets/dialogs/newitemdialog.h
diff --git a/UIs/GenericWidgets/dialogs/settingsdialog.cpp b/UIs/BeetRoundWidgets/dialogs/settingsdialog.cpp
similarity index 100%
rename from UIs/GenericWidgets/dialogs/settingsdialog.cpp
rename to UIs/BeetRoundWidgets/dialogs/settingsdialog.cpp
diff --git a/UIs/GenericWidgets/dialogs/settingsdialog.h b/UIs/BeetRoundWidgets/dialogs/settingsdialog.h
similarity index 100%
rename from UIs/GenericWidgets/dialogs/settingsdialog.h
rename to UIs/BeetRoundWidgets/dialogs/settingsdialog.h
diff --git a/UIs/GenericWidgets/main.cpp b/UIs/BeetRoundWidgets/main.cpp
similarity index 100%
rename from UIs/GenericWidgets/main.cpp
rename to UIs/BeetRoundWidgets/main.cpp
diff --git a/UIs/GenericWidgets/mainwindow.cpp b/UIs/BeetRoundWidgets/mainwindow.cpp
similarity index 100%
rename from UIs/GenericWidgets/mainwindow.cpp
rename to UIs/BeetRoundWidgets/mainwindow.cpp
diff --git a/UIs/GenericWidgets/mainwindow.h b/UIs/BeetRoundWidgets/mainwindow.h
similarity index 100%
rename from UIs/GenericWidgets/mainwindow.h
rename to UIs/BeetRoundWidgets/mainwindow.h
diff --git a/UIs/GenericWidgets/mainwindow.ui b/UIs/BeetRoundWidgets/mainwindow.ui
similarity index 100%
rename from UIs/GenericWidgets/mainwindow.ui
rename to UIs/BeetRoundWidgets/mainwindow.ui
diff --git a/UIs/GenericWidgets/utils/messagehandler.h b/UIs/BeetRoundWidgets/utils/messagehandler.h
similarity index 100%
rename from UIs/GenericWidgets/utils/messagehandler.h
rename to UIs/BeetRoundWidgets/utils/messagehandler.h
diff --git a/UIs/GenericWidgets/views/itemdetailmapper.cpp b/UIs/BeetRoundWidgets/views/itemdetailmapper.cpp
similarity index 100%
rename from UIs/GenericWidgets/views/itemdetailmapper.cpp
rename to UIs/BeetRoundWidgets/views/itemdetailmapper.cpp
diff --git a/UIs/GenericWidgets/views/itemdetailmapper.h b/UIs/BeetRoundWidgets/views/itemdetailmapper.h
similarity index 100%
rename from UIs/GenericWidgets/views/itemdetailmapper.h
rename to UIs/BeetRoundWidgets/views/itemdetailmapper.h