diff --git a/src/main.cpp b/src/main.cpp
index 06cbde0..7c88e83 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,8 +4,8 @@
 
 #include <database/databasemanager.h>
 
-#include <services/AuthorService.h>
-#include <services/BookService.h>
+#include <services/author_service.h>
+#include <services/book_service.h>
 
 #include <QDebug>
 
diff --git a/src/repositories/AuthorRepository.cpp b/src/repositories/author_repository.cpp
similarity index 98%
rename from src/repositories/AuthorRepository.cpp
rename to src/repositories/author_repository.cpp
index c25725f..6c54d7c 100644
--- a/src/repositories/AuthorRepository.cpp
+++ b/src/repositories/author_repository.cpp
@@ -1,5 +1,5 @@
 // #define BUILD_REPOSITORIES
-#include "AuthorRepository.h"
+#include "author_repository.h"
 
 #include <sql_builder/insert.h>
 #include <sql_builder/select.h>
diff --git a/src/repositories/AuthorRepository.h b/src/repositories/author_repository.h
similarity index 100%
rename from src/repositories/AuthorRepository.h
rename to src/repositories/author_repository.h
diff --git a/src/repositories/BookRepository.cpp b/src/repositories/book_repository.cpp
similarity index 98%
rename from src/repositories/BookRepository.cpp
rename to src/repositories/book_repository.cpp
index 9c94ddc..9c621dd 100644
--- a/src/repositories/BookRepository.cpp
+++ b/src/repositories/book_repository.cpp
@@ -1,5 +1,5 @@
 // #define BUILD_REPOSITORIES
-#include "BookRepository.h"
+#include "book_repository.h"
 
 #include <QDebug>
 #include <qsqlerror.h>
diff --git a/src/repositories/BookRepository.h b/src/repositories/book_repository.h
similarity index 100%
rename from src/repositories/BookRepository.h
rename to src/repositories/book_repository.h
diff --git a/src/restapi/restapiserver.cpp b/src/restapi/restapiserver.cpp
index d00ac71..7124518 100644
--- a/src/restapi/restapiserver.cpp
+++ b/src/restapi/restapiserver.cpp
@@ -1,7 +1,7 @@
 #include "restapiserver.h"
 
-#include <services/AuthorService.h>
-#include <services/BookService.h>
+#include <services/author_service.h>
+#include <services/book_service.h>
 
 #include <QJsonArray>
 #include <QJsonDocument>
diff --git a/src/services/AuthorService.cpp b/src/services/author_service.cpp
similarity index 88%
rename from src/services/AuthorService.cpp
rename to src/services/author_service.cpp
index adb5f8e..39a2c01 100644
--- a/src/services/AuthorService.cpp
+++ b/src/services/author_service.cpp
@@ -1,5 +1,5 @@
 // #define BUILD_SERVICES
-#include "AuthorService.h"
+#include "author_service.h"
 
 QVector<model::Author> AuthorService::fetchAll()
 {
diff --git a/src/services/AuthorService.h b/src/services/author_service.h
similarity index 87%
rename from src/services/AuthorService.h
rename to src/services/author_service.h
index cc518ab..97288ed 100644
--- a/src/services/AuthorService.h
+++ b/src/services/author_service.h
@@ -2,7 +2,7 @@
 
 #include <model/author.h>
 
-#include <repositories/AuthorRepository.h>
+#include <repositories/author_repository.h>
 
 #include <QVector>
 
diff --git a/src/services/BookService.cpp b/src/services/book_service.cpp
similarity index 91%
rename from src/services/BookService.cpp
rename to src/services/book_service.cpp
index 105dee0..ca32b3b 100644
--- a/src/services/BookService.cpp
+++ b/src/services/book_service.cpp
@@ -1,6 +1,6 @@
 // #define BUILD_SERVICES
-#include "BookService.h"
-#include "AuthorService.h"
+#include "book_service.h"
+#include "author_service.h"
 
 QVector<model::Book> BookService::fetchAll()
 {
diff --git a/src/services/BookService.h b/src/services/book_service.h
similarity index 88%
rename from src/services/BookService.h
rename to src/services/book_service.h
index b051c99..cddc97b 100644
--- a/src/services/BookService.h
+++ b/src/services/book_service.h
@@ -2,7 +2,7 @@
 
 #include <model/book.h>
 
-#include <repositories/BookRepository.h>
+#include <repositories/book_repository.h>
 
 #include <QVector>