diff --git a/app/models/analyze/graph/students_and_teachers.rb b/app/models/analyze/graph/students_and_teachers.rb
index 8039c8ce..bb21052e 100644
--- a/app/models/analyze/graph/students_and_teachers.rb
+++ b/app/models/analyze/graph/students_and_teachers.rb
@@ -13,7 +13,7 @@ module Analyze
       end
 
       def columns
-        [Student, Teacher, GroupedBarColumnPresenter]
+        [AllStudent, AllTeacher, GroupedBarColumnPresenter]
       end
     end
   end
diff --git a/app/models/analyze/graph/students_by_group.rb b/app/models/analyze/graph/students_by_group.rb
index 20e6e4ed..d08bb1b3 100644
--- a/app/models/analyze/graph/students_by_group.rb
+++ b/app/models/analyze/graph/students_by_group.rb
@@ -17,7 +17,7 @@ module Analyze
          Analyze::Graph::Column::MiddleEastern,
          Analyze::Graph::Column::Unknown,
          Analyze::Graph::Column::White,
-         Analyze::Graph::Column::Student]
+         Analyze::Graph::Column::AllStudent]
       end
     end
   end
diff --git a/app/presenters/analyze/graph/column/student.rb b/app/presenters/analyze/graph/column/all_student.rb
similarity index 93%
rename from app/presenters/analyze/graph/column/student.rb
rename to app/presenters/analyze/graph/column/all_student.rb
index fe865657..bf689fe4 100644
--- a/app/presenters/analyze/graph/column/student.rb
+++ b/app/presenters/analyze/graph/column/all_student.rb
@@ -3,7 +3,7 @@
 module Analyze
   module Graph
     module Column
-      class Student < GroupedBarColumnPresenter
+      class AllStudent < GroupedBarColumnPresenter
         def label
           'All Students'
         end
diff --git a/app/presenters/analyze/graph/column/teacher.rb b/app/presenters/analyze/graph/column/all_teacher.rb
similarity index 93%
rename from app/presenters/analyze/graph/column/teacher.rb
rename to app/presenters/analyze/graph/column/all_teacher.rb
index 652b2464..d8f94364 100644
--- a/app/presenters/analyze/graph/column/teacher.rb
+++ b/app/presenters/analyze/graph/column/all_teacher.rb
@@ -3,7 +3,7 @@
 module Analyze
   module Graph
     module Column
-      class Teacher < GroupedBarColumnPresenter
+      class AllTeacher < GroupedBarColumnPresenter
         def label
           'All Teachers'
         end
diff --git a/spec/presenters/grouped_bar_column_presenter_spec.rb b/spec/presenters/grouped_bar_column_presenter_spec.rb
index 4f33fe62..efdda151 100644
--- a/spec/presenters/grouped_bar_column_presenter_spec.rb
+++ b/spec/presenters/grouped_bar_column_presenter_spec.rb
@@ -63,13 +63,13 @@ describe GroupedBarColumnPresenter do
   end
 
   let(:student_presenter) do
-    Analyze::Graph::Column::Student.new measure: measure_with_student_survey_items, school:, academic_years:,
-                                        position: 0, number_of_columns: 3
+    Analyze::Graph::Column::AllStudent.new measure: measure_with_student_survey_items, school:, academic_years:,
+                                           position: 0, number_of_columns: 3
   end
 
   let(:teacher_presenter) do
-    Analyze::Graph::Column::Teacher.new measure: measure_with_teacher_survey_items, school:, academic_years:,
-                                        position: 0, number_of_columns: 3
+    Analyze::Graph::Column::AllTeacher.new measure: measure_with_teacher_survey_items, school:, academic_years:,
+                                           position: 0, number_of_columns: 3
   end
 
   let(:all_data_presenter) do