diff --git a/lib/pangea/extensions/client_extension/classes_and_exchanges_extension.dart b/lib/pangea/extensions/client_extension/classes_and_exchanges_extension.dart
index 5417df6ae..3108a90f5 100644
--- a/lib/pangea/extensions/client_extension/classes_and_exchanges_extension.dart
+++ b/lib/pangea/extensions/client_extension/classes_and_exchanges_extension.dart
@@ -1,6 +1,6 @@
 part of "client_extension.dart";
 
-extension PangeaClient2 on Client {
+extension ClassesAndExchangesClientExtension on Client {
   List<Room> get _classes => rooms.where((e) => e.isPangeaClass).toList();
 
   List<Room> get _classesImTeaching => rooms
diff --git a/lib/pangea/extensions/client_extension/client_analytics_extension.dart b/lib/pangea/extensions/client_extension/client_analytics_extension.dart
index b28bf28a9..9cd00df23 100644
--- a/lib/pangea/extensions/client_extension/client_analytics_extension.dart
+++ b/lib/pangea/extensions/client_extension/client_analytics_extension.dart
@@ -1,6 +1,6 @@
 part of "client_extension.dart";
 
-extension PangeaClient1 on Client {
+extension AnalyticsClientExtension on Client {
   // get analytics room matching targetlanguage
   // if not present, create it and invite teachers of that language
   // set description to let people know what the hell it is
diff --git a/lib/pangea/extensions/client_extension/client_extension.dart b/lib/pangea/extensions/client_extension/client_extension.dart
index 38e3c5582..c2c673dff 100644
--- a/lib/pangea/extensions/client_extension/client_extension.dart
+++ b/lib/pangea/extensions/client_extension/client_extension.dart
@@ -13,8 +13,8 @@ import 'package:matrix/matrix.dart';
 
 import '../../utils/p_store.dart';
 
-part "analytics_extension.dart";
 part "classes_and_exchanges_extension.dart";
+part "client_analytics_extension.dart";
 part "general_info_extension.dart";
 
 extension PangeaClient on Client {
diff --git a/lib/pangea/extensions/client_extension/general_info_extension.dart b/lib/pangea/extensions/client_extension/general_info_extension.dart
index 0fb2fe26c..af9700cf6 100644
--- a/lib/pangea/extensions/client_extension/general_info_extension.dart
+++ b/lib/pangea/extensions/client_extension/general_info_extension.dart
@@ -1,6 +1,6 @@
 part of "client_extension.dart";
 
-extension PangeaClient3 on Client {
+extension GeneralInfoClientExtension on Client {
   Future<List<String>> get _teacherRoomIds async {
     final List<String> adminRoomIds = [];
     for (final Room adminSpace in (await _classesAndExchangesImTeaching)) {
diff --git a/lib/pangea/extensions/pangea_room_extension/children_and_parents_extension.dart b/lib/pangea/extensions/pangea_room_extension/children_and_parents_extension.dart
index d7acfbd34..4362c17d8 100644
--- a/lib/pangea/extensions/pangea_room_extension/children_and_parents_extension.dart
+++ b/lib/pangea/extensions/pangea_room_extension/children_and_parents_extension.dart
@@ -1,6 +1,6 @@
 part of "pangea_room_extension.dart";
 
-extension PangeaRoom2 on Room {
+extension ChildrenAndParentsRoomExtension on Room {
   //note this only will return rooms that the user has joined or been invited to
   List<Room> get _joinedChildren {
     if (!isSpace) return [];
diff --git a/lib/pangea/extensions/pangea_room_extension/class_and_exchange_settings_extension.dart b/lib/pangea/extensions/pangea_room_extension/class_and_exchange_settings_extension.dart
index 7351d0272..02888710e 100644
--- a/lib/pangea/extensions/pangea_room_extension/class_and_exchange_settings_extension.dart
+++ b/lib/pangea/extensions/pangea_room_extension/class_and_exchange_settings_extension.dart
@@ -1,6 +1,6 @@
 part of "pangea_room_extension.dart";
 
-extension PangeaRoom3 on Room {
+extension ClassAndExchangeSettingsRoomExtension on Room {
   DateTime? get _rulesUpdatedAt {
     if (!isSpace) return null;
     return pangeaRoomRulesStateEvent?.originServerTs ?? creationTime;
diff --git a/lib/pangea/extensions/pangea_room_extension/events_extension.dart b/lib/pangea/extensions/pangea_room_extension/events_extension.dart
index f0d652f34..ecf9ac941 100644
--- a/lib/pangea/extensions/pangea_room_extension/events_extension.dart
+++ b/lib/pangea/extensions/pangea_room_extension/events_extension.dart
@@ -1,6 +1,6 @@
 part of "pangea_room_extension.dart";
 
-extension PangeaRoom4 on Room {
+extension EventsRoomExtension on Room {
   Future<Event?> _sendPangeaEvent({
     required Map<String, dynamic> content,
     required String parentEventId,
diff --git a/lib/pangea/extensions/pangea_room_extension/pangea_room_extension.dart b/lib/pangea/extensions/pangea_room_extension/pangea_room_extension.dart
index fa9e494d5..13606fbc2 100644
--- a/lib/pangea/extensions/pangea_room_extension/pangea_room_extension.dart
+++ b/lib/pangea/extensions/pangea_room_extension/pangea_room_extension.dart
@@ -33,10 +33,10 @@ import '../../models/student_analytics_summary_model.dart';
 import '../../utils/p_store.dart';
 import '../client_extension/client_extension.dart';
 
-part "analytics_extension.dart";
 part "children_and_parents_extension.dart";
 part "class_and_exchange_settings_extension.dart";
 part "events_extension.dart";
+part "room_analytics_extension.dart";
 part "room_information_extension.dart";
 part "room_settings_extension.dart";
 part "user_permissions_extension.dart";
diff --git a/lib/pangea/extensions/pangea_room_extension/room_analytics_extension.dart b/lib/pangea/extensions/pangea_room_extension/room_analytics_extension.dart
index b23608170..b6c58a40d 100644
--- a/lib/pangea/extensions/pangea_room_extension/room_analytics_extension.dart
+++ b/lib/pangea/extensions/pangea_room_extension/room_analytics_extension.dart
@@ -1,6 +1,6 @@
 part of "pangea_room_extension.dart";
 
-extension PangeaRoom1 on Room {
+extension AnalyticsRoomExtension on Room {
   // Join analytics rooms in space
   // Allows teachers to join analytics rooms without being invited
   Future<void> _joinAnalyticsRoomsInSpace() async {
diff --git a/lib/pangea/extensions/pangea_room_extension/room_information_extension.dart b/lib/pangea/extensions/pangea_room_extension/room_information_extension.dart
index fe57e8cc8..0c34a8aaf 100644
--- a/lib/pangea/extensions/pangea_room_extension/room_information_extension.dart
+++ b/lib/pangea/extensions/pangea_room_extension/room_information_extension.dart
@@ -1,6 +1,6 @@
 part of "pangea_room_extension.dart";
 
-extension PangeaRoom5 on Room {
+extension RoomInformationRoomExtension on Room {
   DateTime? get _creationTime =>
       getState(EventTypes.RoomCreate)?.originServerTs;
 
diff --git a/lib/pangea/extensions/pangea_room_extension/room_settings_extension.dart b/lib/pangea/extensions/pangea_room_extension/room_settings_extension.dart
index dfc9292d3..6995659d3 100644
--- a/lib/pangea/extensions/pangea_room_extension/room_settings_extension.dart
+++ b/lib/pangea/extensions/pangea_room_extension/room_settings_extension.dart
@@ -1,6 +1,6 @@
 part of "pangea_room_extension.dart";
 
-extension PangeaRoom6 on Room {
+extension RoomSettingsRoomExtension on Room {
   PangeaRoomRules? get _pangeaRoomRules {
     try {
       final Map<String, dynamic>? content = pangeaRoomRulesStateEvent?.content;
diff --git a/lib/pangea/extensions/pangea_room_extension/user_permissions_extension.dart b/lib/pangea/extensions/pangea_room_extension/user_permissions_extension.dart
index 946f33071..929a74e66 100644
--- a/lib/pangea/extensions/pangea_room_extension/user_permissions_extension.dart
+++ b/lib/pangea/extensions/pangea_room_extension/user_permissions_extension.dart
@@ -1,6 +1,6 @@
 part of "pangea_room_extension.dart";
 
-extension PangeaRoom7 on Room {
+extension UserPermissionsRoomExtension on Room {
   bool _isMadeByUser(String userId) =>
       getState(EventTypes.RoomCreate)?.senderId == userId;