diff --git a/app/src/main/java/be/ugent/sel/studeez/di/DatabaseModule.kt b/app/src/main/java/be/ugent/sel/studeez/di/DatabaseModule.kt
index 7ee4992..93dea2d 100644
--- a/app/src/main/java/be/ugent/sel/studeez/di/DatabaseModule.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/di/DatabaseModule.kt
@@ -26,11 +26,11 @@ abstract class DatabaseModule {
     abstract fun provideConfigurationService(impl: FirebaseConfigurationService): ConfigurationService
 
     @Binds
-    abstract fun provideSessionDAO(impl: FireBaseSessionDAO): SessionDAO
+    abstract fun provideSessionDAO(impl: FirebaseSessionDAO): SessionDAO
 
     @Binds
-    abstract fun provideSubjectDAO(impl: FireBaseSubjectDAO): SubjectDAO
+    abstract fun provideSubjectDAO(impl: FirebaseSubjectDAO): SubjectDAO
 
     @Binds
-    abstract fun provideTaskDAO(impl: FireBaseTaskDAO): TaskDAO
+    abstract fun provideTaskDAO(impl: FirebaseTaskDAO): TaskDAO
 }
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseCollections.kt b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseCollections.kt
similarity index 90%
rename from app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseCollections.kt
rename to app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseCollections.kt
index 78867c9..fcdc0a4 100644
--- a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseCollections.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseCollections.kt
@@ -1,6 +1,6 @@
 package be.ugent.sel.studeez.domain.implementation
 
-object FireBaseCollections {
+object FirebaseCollections {
     const val SESSION_COLLECTION = "sessions"
     const val USER_COLLECTION = "users"
     const val TIMER_COLLECTION = "timers"
diff --git a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseSessionDAO.kt b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseSessionDAO.kt
similarity index 87%
rename from app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseSessionDAO.kt
rename to app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseSessionDAO.kt
index a818236..ca7c6aa 100644
--- a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseSessionDAO.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseSessionDAO.kt
@@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
-class FireBaseSessionDAO @Inject constructor(
+class FirebaseSessionDAO @Inject constructor(
     private val firestore: FirebaseFirestore,
     private val auth: AccountDAO
 ) : SessionDAO {
@@ -31,7 +31,7 @@ class FireBaseSessionDAO @Inject constructor(
     }
 
     private fun currentUserSessionsCollection(): CollectionReference =
-        firestore.collection(FireBaseCollections.USER_COLLECTION)
+        firestore.collection(FirebaseCollections.USER_COLLECTION)
             .document(auth.currentUserId)
-            .collection(FireBaseCollections.SESSION_COLLECTION)
+            .collection(FirebaseCollections.SESSION_COLLECTION)
 }
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseSubjectDAO.kt b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseSubjectDAO.kt
similarity index 87%
rename from app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseSubjectDAO.kt
rename to app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseSubjectDAO.kt
index 7d90fbf..fc93da1 100644
--- a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseSubjectDAO.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseSubjectDAO.kt
@@ -10,7 +10,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
-class FireBaseSubjectDAO @Inject constructor(
+class FirebaseSubjectDAO @Inject constructor(
     private val firestore: FirebaseFirestore,
     private val auth: AccountDAO,
 ) : SubjectDAO {
@@ -33,7 +33,7 @@ class FireBaseSubjectDAO @Inject constructor(
     }
 
     private fun currentUserSubjectsCollection(): CollectionReference =
-        firestore.collection(FireBaseCollections.USER_COLLECTION)
+        firestore.collection(FirebaseCollections.USER_COLLECTION)
             .document(auth.currentUserId)
-            .collection(FireBaseCollections.SUBJECT_COLLECTION)
+            .collection(FirebaseCollections.SUBJECT_COLLECTION)
 }
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseTaskDAO.kt b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseTaskDAO.kt
similarity index 87%
rename from app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseTaskDAO.kt
rename to app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseTaskDAO.kt
index b8855e6..d0185ff 100644
--- a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseTaskDAO.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseTaskDAO.kt
@@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
-class FireBaseTaskDAO @Inject constructor(
+class FirebaseTaskDAO @Inject constructor(
     private val firestore: FirebaseFirestore,
     private val auth: AccountDAO,
 ) : TaskDAO {
@@ -41,9 +41,9 @@ class FireBaseTaskDAO @Inject constructor(
     }
 
     private fun selectedSubjectTasksCollection(subjectId: String): CollectionReference =
-        firestore.collection(FireBaseCollections.USER_COLLECTION)
+        firestore.collection(FirebaseCollections.USER_COLLECTION)
             .document(auth.currentUserId)
-            .collection(FireBaseCollections.SUBJECT_COLLECTION)
+            .collection(FirebaseCollections.SUBJECT_COLLECTION)
             .document(subjectId)
-            .collection(FireBaseCollections.TASK_COLLECTION)
+            .collection(FirebaseCollections.TASK_COLLECTION)
 }
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseTimerDAO.kt b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseTimerDAO.kt
index 1f37a18..dad7047 100644
--- a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseTimerDAO.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseTimerDAO.kt
@@ -48,8 +48,8 @@ class FirebaseTimerDAO @Inject constructor(
     }
 
     private fun currentUserTimersCollection(): CollectionReference =
-        firestore.collection(FireBaseCollections.USER_COLLECTION)
+        firestore.collection(FirebaseCollections.USER_COLLECTION)
             .document(auth.currentUserId)
-            .collection(FireBaseCollections.TIMER_COLLECTION)
+            .collection(FirebaseCollections.TIMER_COLLECTION)
 
 }
\ No newline at end of file