diff --git a/app/src/main/java/com/p_vacho/neat_calendar/fragments/AppSettingsBarFragment.kt b/app/src/main/java/com/p_vacho/neat_calendar/fragments/MainBarFragment.kt
similarity index 90%
rename from app/src/main/java/com/p_vacho/neat_calendar/fragments/AppSettingsBarFragment.kt
rename to app/src/main/java/com/p_vacho/neat_calendar/fragments/MainBarFragment.kt
index c2c8f83..358ecec 100644
--- a/app/src/main/java/com/p_vacho/neat_calendar/fragments/AppSettingsBarFragment.kt
+++ b/app/src/main/java/com/p_vacho/neat_calendar/fragments/MainBarFragment.kt
@@ -11,14 +11,14 @@ import com.google.android.material.textview.MaterialTextView
 import com.p_vacho.neat_calendar.R
 import com.p_vacho.neat_calendar.activities.SettingsActivity
 
-class AppSettingsBarFragment : Fragment() {
+class MainBarFragment : Fragment() {
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
         // Inflate the layout for our new app settings bar
-        return inflater.inflate(R.layout.fragment_app_settings_bar, container, false)
+        return inflater.inflate(R.layout.fragment_main_bar, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/layout/activity_calendar.xml b/app/src/main/res/layout/activity_calendar.xml
index 99fb67d..896b0d0 100644
--- a/app/src/main/res/layout/activity_calendar.xml
+++ b/app/src/main/res/layout/activity_calendar.xml
@@ -9,14 +9,14 @@
 
     <!-- Include Server Settings Bar -->
     <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/settingsBarFragment"
-        android:name="com.p_vacho.neat_calendar.fragments.AppSettingsBarFragment"
+        android:id="@+id/mainBarFragment"
+        android:name="com.p_vacho.neat_calendar.fragments.MainBarFragment"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        tools:layout="@layout/fragment_app_settings_bar" />
+        tools:layout="@layout/fragment_main_bar" />
 
     <!-- Previous Month Button -->
     <ImageButton
@@ -27,7 +27,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:src="@drawable/ic_arrow_left"
         app:tint="?android:attr/textColorPrimary"
-        app:layout_constraintTop_toBottomOf="@id/settingsBarFragment"
+        app:layout_constraintTop_toBottomOf="@id/mainBarFragment"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="@id/tvMonthYear"
         android:contentDescription="@string/previous_month" />
@@ -42,7 +42,7 @@
         android:text=""
         tools:text="January 2024"
         android:textAppearance="?attr/textAppearanceHeadline6"
-        app:layout_constraintTop_toBottomOf="@id/settingsBarFragment"
+        app:layout_constraintTop_toBottomOf="@id/mainBarFragment"
         app:layout_constraintStart_toEndOf="@id/btnPreviousMonth"
         app:layout_constraintEnd_toStartOf="@id/btnNextMonth" />
 
@@ -55,7 +55,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:src="@drawable/ic_arrow_right"
         app:tint="?android:attr/textColorPrimary"
-        app:layout_constraintTop_toBottomOf="@id/settingsBarFragment"
+        app:layout_constraintTop_toBottomOf="@id/mainBarFragment"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="@id/tvMonthYear"
         android:contentDescription="@string/next_month" />
diff --git a/app/src/main/res/layout/fragment_app_settings_bar.xml b/app/src/main/res/layout/fragment_main_bar.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_app_settings_bar.xml
rename to app/src/main/res/layout/fragment_main_bar.xml