diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-instructor-session-type.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-instructor-session-type-graph.js
similarity index 80%
rename from packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-instructor-session-type.js
rename to packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-instructor-session-type-graph.js
index e485c3ce14..45cc0f87c5 100644
--- a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-instructor-session-type.js
+++ b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-instructor-session-type-graph.js
@@ -1,7 +1,7 @@
 import { collection, create, notHasClass } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-visualizer-course-instructor-session-type]',
+  scope: '[data-test-course-visualize-instructor-session-type-graph]',
   isIcon: notHasClass('no-icon'),
   chart: {
     scope: '.simple-chart',
diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-session-type.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-instructor-term-graph.js
similarity index 83%
rename from packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-session-type.js
rename to packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-instructor-term-graph.js
index 61905c81e7..f32aca173e 100644
--- a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-session-type.js
+++ b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-instructor-term-graph.js
@@ -1,7 +1,7 @@
 import { collection, create, notHasClass } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-visualizer-course-session-type]',
+  scope: '[data-test-course-visualize-instructor-term-graph]',
   isIcon: notHasClass('no-icon'),
   chart: {
     scope: '.simple-chart',
diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-instructor.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-instructor.js
index 796de3d8ff..94dbe90361 100644
--- a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-instructor.js
+++ b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-instructor.js
@@ -1,6 +1,6 @@
 import { attribute, collection, create, text } from 'ember-cli-page-object';
-import termsChart from '../visualizer-course-instructor-term';
-import sessionTypesChart from '../visualizer-course-instructor-session-type';
+import termsChart from './visualize-instructor-term-graph';
+import sessionTypesChart from './visualize-instructor-session-type-graph';
 
 const definition = create({
   scope: '[data-test-course-visualize-instructor]',
diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-session-types.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-instructors-graph.js
similarity index 85%
rename from packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-session-types.js
rename to packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-instructors-graph.js
index ffdb3b5f53..9756c3a2f6 100644
--- a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-session-types.js
+++ b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-instructors-graph.js
@@ -1,7 +1,7 @@
 import { collection, create, notHasClass } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-visualizer-course-session-types]',
+  scope: '[data-test-course-visualize-instructors-graph]',
   isIcon: notHasClass('no-icon'),
   chart: {
     scope: '.simple-chart',
diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-instructors.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-instructors.js
index 5906eebc2c..6c80e5ab66 100644
--- a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-instructors.js
+++ b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-instructors.js
@@ -1,5 +1,5 @@
 import { attribute, collection, create, fillable, text, value } from 'ember-cli-page-object';
-import instructorsChart from '../visualizer-course-instructors';
+import instructorsChart from './visualize-instructors-graph';
 
 const definition = create({
   scope: '[data-test-course-visualize-instructors]',
diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-objectives.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-objectives-graph.js
similarity index 96%
rename from packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-objectives.js
rename to packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-objectives-graph.js
index 090b098718..b9faf66f8a 100644
--- a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-objectives.js
+++ b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-objectives-graph.js
@@ -1,7 +1,7 @@
 import { attribute, clickable, collection, create, notHasClass, text } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-visualizer-course-objectives]',
+  scope: '[data-test-course-visualize-objectives-graph]',
   isIcon: notHasClass('no-icon'),
   chart: {
     scope: '.simple-chart',
diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-objectives.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-objectives.js
index 2c0e801fa1..00def44396 100644
--- a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-objectives.js
+++ b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-objectives.js
@@ -1,5 +1,5 @@
 import { attribute, collection, create, text } from 'ember-cli-page-object';
-import objectivesChart from '../visualizer-course-objectives';
+import objectivesChart from './visualize-objectives-graph';
 
 const definition = create({
   scope: '[data-test-course-visualize-objectives]',
diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-instructor-term.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-session-type-graph.js
similarity index 84%
rename from packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-instructor-term.js
rename to packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-session-type-graph.js
index 87dd646391..34a30b5bb5 100644
--- a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-instructor-term.js
+++ b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-session-type-graph.js
@@ -1,7 +1,7 @@
 import { collection, create, notHasClass } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-visualizer-course-instructor-term]',
+  scope: '[data-test-course-visualize-session-type-graph]',
   isIcon: notHasClass('no-icon'),
   chart: {
     scope: '.simple-chart',
diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-session-type.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-session-type.js
index 5d10b3c92a..96faac9b28 100644
--- a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-session-type.js
+++ b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-session-type.js
@@ -1,5 +1,5 @@
 import { attribute, collection, create, text } from 'ember-cli-page-object';
-import sessionTypeChart from '../visualizer-course-session-type';
+import sessionTypeChart from './visualize-session-type-graph';
 
 const definition = create({
   scope: '[data-test-course-visualize-session-type]',
diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-instructors.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-session-types-graph.js
similarity index 85%
rename from packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-instructors.js
rename to packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-session-types-graph.js
index be092645bd..976103feab 100644
--- a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-instructors.js
+++ b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-session-types-graph.js
@@ -1,7 +1,7 @@
 import { collection, create, notHasClass } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-visualizer-course-instructors]',
+  scope: '[data-test-course-visualize-session-types-graph]',
   isIcon: notHasClass('no-icon'),
   chart: {
     scope: '.simple-chart',
diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-session-types.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-session-types.js
index 0853ad598b..e56d4fbc0a 100644
--- a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-session-types.js
+++ b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-session-types.js
@@ -1,5 +1,5 @@
 import { attribute, collection, create, fillable, text, value } from 'ember-cli-page-object';
-import sessionTypesChart from '../visualizer-course-session-types';
+import sessionTypesChart from './visualize-session-types-graph';
 
 const definition = create({
   scope: '[data-test-course-visualize-session-types]',
diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-vocabularies.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-vocabularies-graph.js
similarity index 82%
rename from packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-vocabularies.js
rename to packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-vocabularies-graph.js
index bffe396b82..d6498f2f17 100644
--- a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-vocabularies.js
+++ b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-vocabularies-graph.js
@@ -1,7 +1,7 @@
 import { collection, create, notHasClass } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-visualizer-course-vocabularies]',
+  scope: '[data-test-course-visualize-vocabularies-graph]',
   isIcon: notHasClass('no-icon'),
   chart: {
     scope: '.simple-chart',
diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-vocabularies.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-vocabularies.js
index 5bcd2f725c..d032a2215a 100644
--- a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-vocabularies.js
+++ b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-vocabularies.js
@@ -1,5 +1,5 @@
 import { attribute, collection, create } from 'ember-cli-page-object';
-import vocabulariesChart from '../visualizer-course-vocabularies';
+import vocabulariesChart from './visualize-vocabularies-graph';
 
 const definition = create({
   scope: '[data-test-course-visualize-vocabularies]',
diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-vocabulary.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-vocabulary-graph.js
similarity index 84%
rename from packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-vocabulary.js
rename to packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-vocabulary-graph.js
index e351c240fc..4a58a55a36 100644
--- a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/visualizer-course-vocabulary.js
+++ b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-vocabulary-graph.js
@@ -1,7 +1,7 @@
 import { collection, create, notHasClass } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-visualizer-course-vocabulary]',
+  scope: '[data-test-course-visualize-vocabulary-graph]',
   isIcon: notHasClass('no-icon'),
   chart: {
     scope: '.simple-chart',
diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-vocabulary.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-vocabulary.js
index 37f9b6323e..4f00eaf15c 100644
--- a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-vocabulary.js
+++ b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/course/visualize-vocabulary.js
@@ -1,5 +1,5 @@
 import { attribute, collection, create, text } from 'ember-cli-page-object';
-import termsChart from '../visualizer-course-vocabulary';
+import termsChart from './visualize-vocabulary-graph';
 
 const definition = create({
   scope: '[data-test-course-visualize-vocabulary]',
diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/sessions.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/sessions.js
index 37b6bf1aac..91a19bbbb2 100644
--- a/packages/ilios-common/addon-test-support/ilios-common/page-objects/sessions.js
+++ b/packages/ilios-common/addon-test-support/ilios-common/page-objects/sessions.js
@@ -1,5 +1,5 @@
 import { create, visitable } from 'ember-cli-page-object';
-import courseSessions from './components/course-sessions';
+import courseSessions from './components/course/sessions';
 
 export default create({
   visit: visitable('/courses/:courseId'),
diff --git a/packages/ilios-common/addon/components/course/objectives.hbs b/packages/ilios-common/addon/components/course/objectives.hbs
index b2899f38e3..aaee05676c 100644
--- a/packages/ilios-common/addon/components/course/objectives.hbs
+++ b/packages/ilios-common/addon/components/course/objectives.hbs
@@ -30,7 +30,7 @@
           @model={{@course}}
           aria-label={{t "general.visualizeCourseObjectives"}}
         >
-          <VisualizerCourseObjectives
+          <Course::VisualizeObjectivesGraph
             @course={{@course}}
             @width={{20}}
             @height={{20}}
diff --git a/packages/ilios-common/addon/components/course/visualizations.hbs b/packages/ilios-common/addon/components/course/visualizations.hbs
index a95ae10c7b..3c09c142d2 100644
--- a/packages/ilios-common/addon/components/course/visualizations.hbs
+++ b/packages/ilios-common/addon/components/course/visualizations.hbs
@@ -33,7 +33,7 @@
           <h4>
             {{t "general.objectives"}}
           </h4>
-          <VisualizerCourseObjectives @isIcon={{true}} @course={{@model}} @showDataTable={{false}} />
+          <Course::VisualizeObjectivesGraph @isIcon={{true}} @course={{@model}} @showDataTable={{false}} />
         </LinkTo>
       </div>
       <div data-test-visualize-session-types>
@@ -41,7 +41,7 @@
           <h4>
             {{t "general.sessionTypes"}}
           </h4>
-          <VisualizerCourseSessionTypes
+          <Course::VisualizeSessionTypesGraph
             @isIcon={{true}}
             @course={{@model}}
             @chartType="donut"
@@ -53,7 +53,7 @@
           <h4>
             {{t "general.vocabularies"}}
           </h4>
-          <VisualizerCourseVocabularies @isIcon={{true}} @course={{@model}} />
+          <Course::VisualizeVocabulariesGraph @isIcon={{true}} @course={{@model}} />
         </LinkTo>
       </div>
       <div data-test-visualize-instructors>
@@ -61,7 +61,7 @@
           <h4>
             {{t "general.instructors"}}
           </h4>
-          <VisualizerCourseInstructors
+          <Course::VisualizeInstructorsGraph
             @isIcon={{true}}
             @course={{@model}}
             @chartType="donut"
diff --git a/packages/ilios-common/addon/components/visualizer-course-instructor-session-type.hbs b/packages/ilios-common/addon/components/course/visualize-instructor-session-type-graph.hbs
similarity index 75%
rename from packages/ilios-common/addon/components/visualizer-course-instructor-session-type.hbs
rename to packages/ilios-common/addon/components/course/visualize-instructor-session-type-graph.hbs
index 8f619b368f..2020d604a4 100644
--- a/packages/ilios-common/addon/components/visualizer-course-instructor-session-type.hbs
+++ b/packages/ilios-common/addon/components/course/visualize-instructor-session-type-graph.hbs
@@ -1,6 +1,6 @@
 <div
-  class="visualizer-course-instructor-session-type {{unless @isIcon "not-icon"}}"
-  data-test-visualizer-course-instructor-session-type
+  class="course-visualize-instructor-session-type-graph {{unless @isIcon "not-icon"}}"
+  data-test-course-visualize-instructor-session-type-graph
   ...attributes
 >
   {{#if (or @isIcon this.data.length)}}
diff --git a/packages/ilios-common/addon/components/visualizer-course-instructor-session-type.js b/packages/ilios-common/addon/components/course/visualize-instructor-session-type-graph.js
similarity index 97%
rename from packages/ilios-common/addon/components/visualizer-course-instructor-session-type.js
rename to packages/ilios-common/addon/components/course/visualize-instructor-session-type-graph.js
index f1b73f0682..a696afd29e 100644
--- a/packages/ilios-common/addon/components/visualizer-course-instructor-session-type.js
+++ b/packages/ilios-common/addon/components/course/visualize-instructor-session-type-graph.js
@@ -10,7 +10,7 @@ import { TrackedAsyncData } from 'ember-async-data';
 import AsyncProcess from 'ilios-common/classes/async-process';
 import { findBy, mapBy, uniqueValues } from 'ilios-common/utils/array-helpers';
 
-export default class VisualizerCourseInstructorSessionType extends Component {
+export default class CourseVisualizeInstructorSessionTypeGraph extends Component {
   @service router;
   @service intl;
   @tracked tooltipContent = null;
diff --git a/packages/ilios-common/addon/components/visualizer-course-instructor-term.hbs b/packages/ilios-common/addon/components/course/visualize-instructor-term-graph.hbs
similarity index 77%
rename from packages/ilios-common/addon/components/visualizer-course-instructor-term.hbs
rename to packages/ilios-common/addon/components/course/visualize-instructor-term-graph.hbs
index 4846dba19f..e793e14b2b 100644
--- a/packages/ilios-common/addon/components/visualizer-course-instructor-term.hbs
+++ b/packages/ilios-common/addon/components/course/visualize-instructor-term-graph.hbs
@@ -1,6 +1,6 @@
 <div
-  class="visualizer-course-instructor-term {{unless @isIcon "not-icon"}}"
-  data-test-visualizer-course-instructor-term
+  class="course-visualize-instructors-term-graph {{unless @isIcon "not-icon"}}"
+  data-test-course-visualize-instructor-term-graph
   ...attributes
 >
   {{#if (or @isIcon this.data.length)}}
diff --git a/packages/ilios-common/addon/components/visualizer-course-instructor-term.js b/packages/ilios-common/addon/components/course/visualize-instructor-term-graph.js
similarity index 98%
rename from packages/ilios-common/addon/components/visualizer-course-instructor-term.js
rename to packages/ilios-common/addon/components/course/visualize-instructor-term-graph.js
index 4f55cc2209..39bd41c478 100644
--- a/packages/ilios-common/addon/components/visualizer-course-instructor-term.js
+++ b/packages/ilios-common/addon/components/course/visualize-instructor-term-graph.js
@@ -10,7 +10,7 @@ import { TrackedAsyncData } from 'ember-async-data';
 import AsyncProcess from 'ilios-common/classes/async-process';
 import { findBy, mapBy, uniqueValues } from 'ilios-common/utils/array-helpers';
 
-export default class VisualizerCourseInstructorTerm extends Component {
+export default class CourseVisualizeInstructorTermGraph extends Component {
   @service router;
   @service intl;
   @tracked tooltipContent = null;
diff --git a/packages/ilios-common/addon/components/course/visualize-instructor.hbs b/packages/ilios-common/addon/components/course/visualize-instructor.hbs
index 37e0b22917..21477725d3 100644
--- a/packages/ilios-common/addon/components/course/visualize-instructor.hbs
+++ b/packages/ilios-common/addon/components/course/visualize-instructor.hbs
@@ -46,7 +46,7 @@
       <h4>
         {{t "general.terms"}}
       </h4>
-      <VisualizerCourseInstructorTerm
+      <Course::VisualizeInstructorTermGraph
         @course={{@course}}
         @user={{@user}}
       />
@@ -55,7 +55,7 @@
       <h4>
         {{t "general.sessionTypes"}}
       </h4>
-      <VisualizerCourseInstructorSessionType
+      <Course::VisualizeInstructorSessionTypeGraph
         @course={{@course}}
         @user={{@user}}
       />
diff --git a/packages/ilios-common/addon/components/visualizer-course-instructors.hbs b/packages/ilios-common/addon/components/course/visualize-instructors-graph.hbs
similarity index 80%
rename from packages/ilios-common/addon/components/visualizer-course-instructors.hbs
rename to packages/ilios-common/addon/components/course/visualize-instructors-graph.hbs
index 7e3f4a067c..d8e89ab29c 100644
--- a/packages/ilios-common/addon/components/visualizer-course-instructors.hbs
+++ b/packages/ilios-common/addon/components/course/visualize-instructors-graph.hbs
@@ -1,6 +1,6 @@
 <div
-  class="visualizer-course-instructors {{unless @isIcon "not-icon"}}"
-  data-test-visualizer-course-instructors
+  class="course-visualize-instructors-graph {{unless @isIcon "not-icon"}}"
+  data-test-course-visualize-instructors-graph
   ...attributes
 >
   {{#if (or @isIcon this.data.length)}}
diff --git a/packages/ilios-common/addon/components/visualizer-course-instructors.js b/packages/ilios-common/addon/components/course/visualize-instructors-graph.js
similarity index 98%
rename from packages/ilios-common/addon/components/visualizer-course-instructors.js
rename to packages/ilios-common/addon/components/course/visualize-instructors-graph.js
index 98e1bc632c..8d9d47666c 100644
--- a/packages/ilios-common/addon/components/visualizer-course-instructors.js
+++ b/packages/ilios-common/addon/components/course/visualize-instructors-graph.js
@@ -12,7 +12,7 @@ import { TrackedAsyncData } from 'ember-async-data';
 import AsyncProcess from 'ilios-common/classes/async-process';
 import { findBy, mapBy, uniqueValues } from 'ilios-common/utils/array-helpers';
 
-export default class VisualizerCourseInstructors extends Component {
+export default class CourseVisualizeInstructorsGraph extends Component {
   @service router;
   @service intl;
   @tracked tooltipContent = null;
diff --git a/packages/ilios-common/addon/components/course/visualize-instructors.hbs b/packages/ilios-common/addon/components/course/visualize-instructors.hbs
index f102641a68..8846870c04 100644
--- a/packages/ilios-common/addon/components/course/visualize-instructors.hbs
+++ b/packages/ilios-common/addon/components/course/visualize-instructors.hbs
@@ -43,7 +43,7 @@
       >
     </div>
     <div class="visualizations">
-      <VisualizerCourseInstructors @filter={{this.name}} @course={{@model}} />
+      <Course::VisualizeInstructorsGraph @filter={{this.name}} @course={{@model}} />
     </div>
   {{/unless}}
 </section>
diff --git a/packages/ilios-common/addon/components/visualizer-course-objectives.hbs b/packages/ilios-common/addon/components/course/visualize-objectives-graph.hbs
similarity index 97%
rename from packages/ilios-common/addon/components/visualizer-course-objectives.hbs
rename to packages/ilios-common/addon/components/course/visualize-objectives-graph.hbs
index a80085f362..5f99dc16f7 100644
--- a/packages/ilios-common/addon/components/visualizer-course-objectives.hbs
+++ b/packages/ilios-common/addon/components/course/visualize-objectives-graph.hbs
@@ -1,6 +1,6 @@
 <div
-  class="visualizer-course-objectives {{unless @isIcon "not-icon"}}"
-  data-test-visualizer-course-objectives
+  class="course-visualize-objectives-graph {{unless @isIcon "not-icon"}}"
+  data-test-course-visualize-objectives-graph
   ...attributes
 >
   {{#if this.isLoaded}}
diff --git a/packages/ilios-common/addon/components/visualizer-course-objectives.js b/packages/ilios-common/addon/components/course/visualize-objectives-graph.js
similarity index 98%
rename from packages/ilios-common/addon/components/visualizer-course-objectives.js
rename to packages/ilios-common/addon/components/course/visualize-objectives-graph.js
index 68cfd3452c..176e12a260 100644
--- a/packages/ilios-common/addon/components/visualizer-course-objectives.js
+++ b/packages/ilios-common/addon/components/course/visualize-objectives-graph.js
@@ -10,7 +10,7 @@ import { TrackedAsyncData } from 'ember-async-data';
 import AsyncProcess from 'ilios-common/classes/async-process';
 import { mapBy, sortBy, uniqueValues } from 'ilios-common/utils/array-helpers';
 
-export default class VisualizerCourseObjectives extends Component {
+export default class CourseVisualizeObjectivesGraph extends Component {
   @service router;
   @service intl;
   @service dataLoader;
diff --git a/packages/ilios-common/addon/components/course/visualize-objectives.hbs b/packages/ilios-common/addon/components/course/visualize-objectives.hbs
index 24a785dcad..29ac77df4e 100644
--- a/packages/ilios-common/addon/components/course/visualize-objectives.hbs
+++ b/packages/ilios-common/addon/components/course/visualize-objectives.hbs
@@ -31,6 +31,6 @@
     </LinkTo>
   </h3>
   <div class="visualizations">
-    <VisualizerCourseObjectives @course={{@model}} @showDataTable={{true}}/>
+    <Course::VisualizeObjectivesGraph @course={{@model}} @showDataTable={{true}}/>
   </div>
 </section>
diff --git a/packages/ilios-common/addon/components/visualizer-course-term.hbs b/packages/ilios-common/addon/components/course/visualize-session-type-graph.hbs
similarity index 77%
rename from packages/ilios-common/addon/components/visualizer-course-term.hbs
rename to packages/ilios-common/addon/components/course/visualize-session-type-graph.hbs
index f8736cc4fe..04eba89903 100644
--- a/packages/ilios-common/addon/components/visualizer-course-term.hbs
+++ b/packages/ilios-common/addon/components/course/visualize-session-type-graph.hbs
@@ -1,5 +1,7 @@
 <div
-  class="visualizer-course-term {{unless @isIcon "not-icon"}}"
+  class="course-visualize-session-type-graph {{unless @isIcon "not-icon"}}"
+  data-test-course-visualize-session-type-graph
+  ...attributes
 >
   {{#if this.isLoaded}}
     {{#if (or @isIcon this.data.length)}}
diff --git a/packages/ilios-common/addon/components/visualizer-course-session-type.js b/packages/ilios-common/addon/components/course/visualize-session-type-graph.js
similarity index 98%
rename from packages/ilios-common/addon/components/visualizer-course-session-type.js
rename to packages/ilios-common/addon/components/course/visualize-session-type-graph.js
index a4b57deb2b..246b32e155 100644
--- a/packages/ilios-common/addon/components/visualizer-course-session-type.js
+++ b/packages/ilios-common/addon/components/course/visualize-session-type-graph.js
@@ -10,7 +10,7 @@ import { TrackedAsyncData } from 'ember-async-data';
 import AsyncProcess from 'ilios-common/classes/async-process';
 import { findBy, mapBy, uniqueValues } from 'ilios-common/utils/array-helpers';
 
-export default class VisualizerCourseSessionType extends Component {
+export default class CourseVisualizeSessionTypeGraph extends Component {
   @service router;
   @service intl;
   @tracked tooltipContent = null;
diff --git a/packages/ilios-common/addon/components/course/visualize-session-type.hbs b/packages/ilios-common/addon/components/course/visualize-session-type.hbs
index d5323128a2..cdb1883077 100644
--- a/packages/ilios-common/addon/components/course/visualize-session-type.hbs
+++ b/packages/ilios-common/addon/components/course/visualize-session-type.hbs
@@ -38,7 +38,7 @@
       </LinkTo>
     </h3>
     <div class="visualizations">
-      <VisualizerCourseSessionType
+      <Course::VisualizeSessionTypeGraph
         @course={{@model.course}}
         @sessionType={{@model.sessionType}}
       />
diff --git a/packages/ilios-common/addon/components/visualizer-course-session-types.hbs b/packages/ilios-common/addon/components/course/visualize-session-types-graph.hbs
similarity index 79%
rename from packages/ilios-common/addon/components/visualizer-course-session-types.hbs
rename to packages/ilios-common/addon/components/course/visualize-session-types-graph.hbs
index 6f8b751358..4195bb746a 100644
--- a/packages/ilios-common/addon/components/visualizer-course-session-types.hbs
+++ b/packages/ilios-common/addon/components/course/visualize-session-types-graph.hbs
@@ -1,6 +1,6 @@
 <div
-  class="visualizer-course-session-types {{unless @isIcon "not-icon"}}"
-  data-test-visualizer-course-session-types
+  class="course-visualize-session-types-graph {{unless @isIcon "not-icon"}}"
+  data-test-course-visualize-session-types-graph
   ...attributes
 >
   {{#if (or @isIcon this.data.length)}}
diff --git a/packages/ilios-common/addon/components/visualizer-course-session-types.js b/packages/ilios-common/addon/components/course/visualize-session-types-graph.js
similarity index 98%
rename from packages/ilios-common/addon/components/visualizer-course-session-types.js
rename to packages/ilios-common/addon/components/course/visualize-session-types-graph.js
index 01e96d3cce..f334a7b6e7 100644
--- a/packages/ilios-common/addon/components/visualizer-course-session-types.js
+++ b/packages/ilios-common/addon/components/course/visualize-session-types-graph.js
@@ -11,7 +11,7 @@ import { TrackedAsyncData } from 'ember-async-data';
 import AsyncProcess from 'ilios-common/classes/async-process';
 import { findBy, mapBy, uniqueValues } from 'ilios-common/utils/array-helpers';
 
-export default class VisualizerCourseSessionTypes extends Component {
+export default class CourseVisualizeSessionTypesGraph extends Component {
   @service router;
   @service intl;
   @tracked tooltipContent = null;
diff --git a/packages/ilios-common/addon/components/course/visualize-session-types.hbs b/packages/ilios-common/addon/components/course/visualize-session-types.hbs
index ee81878b52..0a96c7db92 100644
--- a/packages/ilios-common/addon/components/course/visualize-session-types.hbs
+++ b/packages/ilios-common/addon/components/course/visualize-session-types.hbs
@@ -41,6 +41,6 @@
     >
   </div>
   <div class="visualizations">
-    <VisualizerCourseSessionTypes @filter={{this.title}} @course={{@model}} />
+    <Course::VisualizeSessionTypesGraph @filter={{this.title}} @course={{@model}} />
   </div>
 </section>
diff --git a/packages/ilios-common/addon/components/visualizer-course-session-type.hbs b/packages/ilios-common/addon/components/course/visualize-term-graph.hbs
similarity index 81%
rename from packages/ilios-common/addon/components/visualizer-course-session-type.hbs
rename to packages/ilios-common/addon/components/course/visualize-term-graph.hbs
index ccd58a92fe..71908bed9d 100644
--- a/packages/ilios-common/addon/components/visualizer-course-session-type.hbs
+++ b/packages/ilios-common/addon/components/course/visualize-term-graph.hbs
@@ -1,6 +1,6 @@
 <div
-  class="visualizer-course-session-type {{unless @isIcon "not-icon"}}"
-  data-test-visualizer-course-session-type
+  class="course-visualize-term-graph {{unless @isIcon "not-icon"}}"
+  data-test-course-visualize-term-graph
   ...attributes
 >
   {{#if this.isLoaded}}
diff --git a/packages/ilios-common/addon/components/visualizer-course-term.js b/packages/ilios-common/addon/components/course/visualize-term-graph.js
similarity index 93%
rename from packages/ilios-common/addon/components/visualizer-course-term.js
rename to packages/ilios-common/addon/components/course/visualize-term-graph.js
index 45d4f7306b..3c9cdbd0ed 100644
--- a/packages/ilios-common/addon/components/visualizer-course-term.js
+++ b/packages/ilios-common/addon/components/course/visualize-term-graph.js
@@ -4,10 +4,15 @@ import { restartableTask, timeout } from 'ember-concurrency';
 import { service } from '@ember/service';
 import { cached, tracked } from '@glimmer/tracking';
 import { TrackedAsyncData } from 'ember-async-data';
-import { findBy, findById, mapBy, uniqueValues } from 'ilios-common/utils/array-helpers';
-import { uniqueById } from '../utils/array-helpers';
+import {
+  findBy,
+  findById,
+  mapBy,
+  uniqueById,
+  uniqueValues,
+} from 'ilios-common/utils/array-helpers';
 
-export default class VisualizerCourseTerm extends Component {
+export default class CourseVisualizeTermGraph extends Component {
   @service router;
   @service intl;
   @tracked tooltipContent = null;
diff --git a/packages/ilios-common/addon/components/course/visualize-term.hbs b/packages/ilios-common/addon/components/course/visualize-term.hbs
index 69efc05808..ca55d32074 100644
--- a/packages/ilios-common/addon/components/course/visualize-term.hbs
+++ b/packages/ilios-common/addon/components/course/visualize-term.hbs
@@ -46,7 +46,7 @@
       </LinkTo>
     </h3>
     <div class="visualizations">
-      <VisualizerCourseTerm @course={{@model.course}} @term={{@model.term}} />
+      <Course::VisualizeTermGraph @course={{@model.course}} @term={{@model.term}} />
     </div>
   {{/unless}}
 </section>
diff --git a/packages/ilios-common/addon/components/visualizer-course-vocabularies.hbs b/packages/ilios-common/addon/components/course/visualize-vocabularies-graph.hbs
similarity index 81%
rename from packages/ilios-common/addon/components/visualizer-course-vocabularies.hbs
rename to packages/ilios-common/addon/components/course/visualize-vocabularies-graph.hbs
index d7d586b09a..3a761a5c1d 100644
--- a/packages/ilios-common/addon/components/visualizer-course-vocabularies.hbs
+++ b/packages/ilios-common/addon/components/course/visualize-vocabularies-graph.hbs
@@ -1,6 +1,6 @@
 <div
-  class="visualizer-course-vocabularies {{unless @isIcon "not-icon"}}"
-  data-test-visualizer-course-vocabularies
+  class="course-visualize-vocabularies-graph {{unless @isIcon "not-icon"}}"
+  data-test-course-visualize-vocabularies-graph
   ...attributes
 >
   {{#if this.isLoaded}}
diff --git a/packages/ilios-common/addon/components/visualizer-course-vocabularies.js b/packages/ilios-common/addon/components/course/visualize-vocabularies-graph.js
similarity index 97%
rename from packages/ilios-common/addon/components/visualizer-course-vocabularies.js
rename to packages/ilios-common/addon/components/course/visualize-vocabularies-graph.js
index cfc09bf4bc..5b891eb2fd 100644
--- a/packages/ilios-common/addon/components/visualizer-course-vocabularies.js
+++ b/packages/ilios-common/addon/components/course/visualize-vocabularies-graph.js
@@ -10,7 +10,7 @@ import { TrackedAsyncData } from 'ember-async-data';
 import AsyncProcess from 'ilios-common/classes/async-process';
 import { findBy, mapBy } from 'ilios-common/utils/array-helpers';
 
-export default class VisualizerCourseVocabularies extends Component {
+export default class CourseVisualizeVocabulariesGraph extends Component {
   @service router;
   @service intl;
   @tracked tooltipContent = null;
diff --git a/packages/ilios-common/addon/components/course/visualize-vocabularies.hbs b/packages/ilios-common/addon/components/course/visualize-vocabularies.hbs
index 01399cd5d8..4845865d9c 100644
--- a/packages/ilios-common/addon/components/course/visualize-vocabularies.hbs
+++ b/packages/ilios-common/addon/components/course/visualize-vocabularies.hbs
@@ -32,6 +32,6 @@
     </LinkTo>
   </h3>
   <div class="visualizations">
-    <VisualizerCourseVocabularies @course={{@model}} />
+    <Course::VisualizeVocabulariesGraph @course={{@model}} />
   </div>
 </section>
diff --git a/packages/ilios-common/addon/components/visualizer-course-vocabulary.hbs b/packages/ilios-common/addon/components/course/visualize-vocabulary-graph.hbs
similarity index 82%
rename from packages/ilios-common/addon/components/visualizer-course-vocabulary.hbs
rename to packages/ilios-common/addon/components/course/visualize-vocabulary-graph.hbs
index d2b91114ae..a5a965be57 100644
--- a/packages/ilios-common/addon/components/visualizer-course-vocabulary.hbs
+++ b/packages/ilios-common/addon/components/course/visualize-vocabulary-graph.hbs
@@ -1,6 +1,6 @@
 <div
-  class="visualizer-course-vocabulary {{unless @isIcon "not-icon"}}"
-  data-test-visualizer-course-vocabulary
+  class="course-visualize-vocabulary-graph {{unless @isIcon "not-icon"}}"
+  data-test-visualize-vocabulary-graph
   ...attributes
 >
   {{#if this.isLoaded}}
diff --git a/packages/ilios-common/addon/components/visualizer-course-vocabulary.js b/packages/ilios-common/addon/components/course/visualize-vocabulary-graph.js
similarity index 98%
rename from packages/ilios-common/addon/components/visualizer-course-vocabulary.js
rename to packages/ilios-common/addon/components/course/visualize-vocabulary-graph.js
index b96ab18515..a1f2b0e9e4 100644
--- a/packages/ilios-common/addon/components/visualizer-course-vocabulary.js
+++ b/packages/ilios-common/addon/components/course/visualize-vocabulary-graph.js
@@ -10,7 +10,7 @@ import { TrackedAsyncData } from 'ember-async-data';
 import AsyncProcess from 'ilios-common/classes/async-process';
 import { findBy, mapBy, uniqueValues } from 'ilios-common/utils/array-helpers';
 
-export default class VisualizerCourseVocabulary extends Component {
+export default class CourseVisualizeVocabularyGraph extends Component {
   @service router;
   @service intl;
   @tracked tooltipContent = null;
diff --git a/packages/ilios-common/addon/components/course/visualize-vocabulary.hbs b/packages/ilios-common/addon/components/course/visualize-vocabulary.hbs
index f767f5e5f0..8745ba8416 100644
--- a/packages/ilios-common/addon/components/course/visualize-vocabulary.hbs
+++ b/packages/ilios-common/addon/components/course/visualize-vocabulary.hbs
@@ -37,7 +37,7 @@
     </LinkTo>
   </h3>
   <div class="visualizations">
-    <VisualizerCourseVocabulary
+    <Course::VisualizeVocabularyGraph
       @course={{@model.course}}
       @vocabulary={{@model.vocabulary}}
     />
diff --git a/packages/ilios-common/app/components/course/visualize-instructor-session-type-graph.js b/packages/ilios-common/app/components/course/visualize-instructor-session-type-graph.js
new file mode 100644
index 0000000000..68e6beec8e
--- /dev/null
+++ b/packages/ilios-common/app/components/course/visualize-instructor-session-type-graph.js
@@ -0,0 +1 @@
+export { default } from 'ilios-common/components/course/visualize-instructor-session-type-graph';
diff --git a/packages/ilios-common/app/components/course/visualize-instructor-term-graph.js b/packages/ilios-common/app/components/course/visualize-instructor-term-graph.js
new file mode 100644
index 0000000000..d627da47d9
--- /dev/null
+++ b/packages/ilios-common/app/components/course/visualize-instructor-term-graph.js
@@ -0,0 +1 @@
+export { default } from 'ilios-common/components/course/visualize-instructor-term-graph';
diff --git a/packages/ilios-common/app/components/course/visualize-instructors-graph.js b/packages/ilios-common/app/components/course/visualize-instructors-graph.js
new file mode 100644
index 0000000000..6e58bb576b
--- /dev/null
+++ b/packages/ilios-common/app/components/course/visualize-instructors-graph.js
@@ -0,0 +1 @@
+export { default } from 'ilios-common/components/course/visualize-instructors-graph';
diff --git a/packages/ilios-common/app/components/course/visualize-objectives-graph.js b/packages/ilios-common/app/components/course/visualize-objectives-graph.js
new file mode 100644
index 0000000000..04777aa612
--- /dev/null
+++ b/packages/ilios-common/app/components/course/visualize-objectives-graph.js
@@ -0,0 +1 @@
+export { default } from 'ilios-common/components/course/visualize-objectives-graph';
diff --git a/packages/ilios-common/app/components/course/visualize-session-type-graph.js b/packages/ilios-common/app/components/course/visualize-session-type-graph.js
new file mode 100644
index 0000000000..0db2e27c17
--- /dev/null
+++ b/packages/ilios-common/app/components/course/visualize-session-type-graph.js
@@ -0,0 +1 @@
+export { default } from 'ilios-common/components/course/visualize-session-type-graph';
diff --git a/packages/ilios-common/app/components/course/visualize-session-types-graph.js b/packages/ilios-common/app/components/course/visualize-session-types-graph.js
new file mode 100644
index 0000000000..33a8f31d2d
--- /dev/null
+++ b/packages/ilios-common/app/components/course/visualize-session-types-graph.js
@@ -0,0 +1 @@
+export { default } from 'ilios-common/components/course/visualize-session-types-graph';
diff --git a/packages/ilios-common/app/components/course/visualize-term-graph.js b/packages/ilios-common/app/components/course/visualize-term-graph.js
new file mode 100644
index 0000000000..eb9e982236
--- /dev/null
+++ b/packages/ilios-common/app/components/course/visualize-term-graph.js
@@ -0,0 +1 @@
+export { default } from 'ilios-common/components/course/visualize-term-graph';
diff --git a/packages/ilios-common/app/components/course/visualize-vocabularies-graph.js b/packages/ilios-common/app/components/course/visualize-vocabularies-graph.js
new file mode 100644
index 0000000000..d55e2ab52f
--- /dev/null
+++ b/packages/ilios-common/app/components/course/visualize-vocabularies-graph.js
@@ -0,0 +1 @@
+export { default } from 'ilios-common/components/course/visualize-vocabularies-graph';
diff --git a/packages/ilios-common/app/components/course/visualize-vocabulary-graph.js b/packages/ilios-common/app/components/course/visualize-vocabulary-graph.js
new file mode 100644
index 0000000000..bc9a4ae975
--- /dev/null
+++ b/packages/ilios-common/app/components/course/visualize-vocabulary-graph.js
@@ -0,0 +1 @@
+export { default } from 'ilios-common/components/course/visualize-vocabulary-graph';
diff --git a/packages/ilios-common/app/components/visualizer-course-instructor-session-type.js b/packages/ilios-common/app/components/visualizer-course-instructor-session-type.js
deleted file mode 100644
index a1c39889e5..0000000000
--- a/packages/ilios-common/app/components/visualizer-course-instructor-session-type.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ilios-common/components/visualizer-course-instructor-session-type';
diff --git a/packages/ilios-common/app/components/visualizer-course-instructor-term.js b/packages/ilios-common/app/components/visualizer-course-instructor-term.js
deleted file mode 100644
index e5da6f3c98..0000000000
--- a/packages/ilios-common/app/components/visualizer-course-instructor-term.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ilios-common/components/visualizer-course-instructor-term';
diff --git a/packages/ilios-common/app/components/visualizer-course-instructors.js b/packages/ilios-common/app/components/visualizer-course-instructors.js
deleted file mode 100644
index 5ea3e7d88e..0000000000
--- a/packages/ilios-common/app/components/visualizer-course-instructors.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ilios-common/components/visualizer-course-instructors';
diff --git a/packages/ilios-common/app/components/visualizer-course-objectives.js b/packages/ilios-common/app/components/visualizer-course-objectives.js
deleted file mode 100644
index 6456df4eac..0000000000
--- a/packages/ilios-common/app/components/visualizer-course-objectives.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ilios-common/components/visualizer-course-objectives';
diff --git a/packages/ilios-common/app/components/visualizer-course-session-type.js b/packages/ilios-common/app/components/visualizer-course-session-type.js
deleted file mode 100644
index facfb1e169..0000000000
--- a/packages/ilios-common/app/components/visualizer-course-session-type.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ilios-common/components/visualizer-course-session-type';
diff --git a/packages/ilios-common/app/components/visualizer-course-session-types.js b/packages/ilios-common/app/components/visualizer-course-session-types.js
deleted file mode 100644
index b4020c4054..0000000000
--- a/packages/ilios-common/app/components/visualizer-course-session-types.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ilios-common/components/visualizer-course-session-types';
diff --git a/packages/ilios-common/app/components/visualizer-course-term.js b/packages/ilios-common/app/components/visualizer-course-term.js
deleted file mode 100644
index 4f872f4d5c..0000000000
--- a/packages/ilios-common/app/components/visualizer-course-term.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ilios-common/components/visualizer-course-term';
diff --git a/packages/ilios-common/app/components/visualizer-course-vocabularies.js b/packages/ilios-common/app/components/visualizer-course-vocabularies.js
deleted file mode 100644
index b691261ce4..0000000000
--- a/packages/ilios-common/app/components/visualizer-course-vocabularies.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ilios-common/components/visualizer-course-vocabularies';
diff --git a/packages/ilios-common/app/components/visualizer-course-vocabulary.js b/packages/ilios-common/app/components/visualizer-course-vocabulary.js
deleted file mode 100644
index db3d00f6ea..0000000000
--- a/packages/ilios-common/app/components/visualizer-course-vocabulary.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ilios-common/components/visualizer-course-vocabulary';
diff --git a/packages/ilios-common/app/styles/ilios-common/components.scss b/packages/ilios-common/app/styles/ilios-common/components.scss
index b3cfadd067..312cd6ef71 100644
--- a/packages/ilios-common/app/styles/ilios-common/components.scss
+++ b/packages/ilios-common/app/styles/ilios-common/components.scss
@@ -103,14 +103,6 @@
 @import "components/truncate-text";
 @import "components/user-search";
 @import "components/user-material-status";
-@import "components/visualizer-course-instructor-session-type";
-@import "components/visualizer-course-instructors";
-@import "components/visualizer-course-objectives";
-@import "components/visualizer-course-session-type";
-@import "components/visualizer-course-session-types";
-@import "components/visualizer-course-term";
-@import "components/visualizer-course-vocabularies";
-@import "components/visualizer-course-vocabulary";
 @import "components/wait-saving";
 @import "components/week-glance";
 @import "components/weekly-calendar";
@@ -137,13 +129,21 @@
 @import "components/course/summary-header";
 @import "components/course/visualizations";
 @import "components/course/visualize-instructor";
+@import "components/course/visualize-instructor-session-type-graph";
 @import "components/course/visualize-instructors";
+@import "components/course/visualize-instructors-graph";
 @import "components/course/visualize-objectives";
+@import "components/course/visualize-objectives-graph";
 @import "components/course/visualize-session-type";
+@import "components/course/visualize-session-type-graph";
 @import "components/course/visualize-session-types";
+@import "components/course/visualize-session-types-graph";
 @import "components/course/visualize-term";
+@import "components/course/visualize-term-graph";
 @import "components/course/visualize-vocabularies";
+@import "components/course/visualize-vocabularies-graph";
 @import "components/course/visualize-vocabulary";
+@import "components/course/visualize-vocabulary-graph";
 
 @import "components/session/collapsed-objectives";
 @import "components/session/objectives";
diff --git a/packages/ilios-common/app/styles/ilios-common/components/course/visualizations.scss b/packages/ilios-common/app/styles/ilios-common/components/course/visualizations.scss
index 9960a6c762..1458eba80f 100644
--- a/packages/ilios-common/app/styles/ilios-common/components/course/visualizations.scss
+++ b/packages/ilios-common/app/styles/ilios-common/components/course/visualizations.scss
@@ -4,10 +4,10 @@
   @include m.data-visualization;
 
   .visualizations {
-    .visualizer-course-instructors,
-    .visualizer-course-objectives,
-    .visualizer-course-session-types,
-    .visualizer-course-vocabularies {
+    .course-visualize-instructors-graph,
+    .course-visualize-objectives-graph,
+    .course-visualize-session-types-graph,
+    .course-visualize-vocabularies-graph {
       height: 40vh;
       margin-bottom: 2rem;
       width: 40vw;
diff --git a/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-instructor-session-type.scss b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-instructor-session-type-graph.scss
similarity index 82%
rename from packages/ilios-common/app/styles/ilios-common/components/visualizer-course-instructor-session-type.scss
rename to packages/ilios-common/app/styles/ilios-common/components/course/visualize-instructor-session-type-graph.scss
index a95ee0a08c..4d8794c5cf 100644
--- a/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-instructor-session-type.scss
+++ b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-instructor-session-type-graph.scss
@@ -1,4 +1,4 @@
-.visualizer-course-instructor-session-type {
+.course-visualize-instructor-session-type-graph {
   display: inline-block;
   height: 1rem;
   width: 1rem;
diff --git a/packages/ilios-common/app/styles/ilios-common/components/course/visualize-instructor.scss b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-instructor.scss
index a7044d04b1..9c4e14bb4f 100644
--- a/packages/ilios-common/app/styles/ilios-common/components/course/visualize-instructor.scss
+++ b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-instructor.scss
@@ -4,8 +4,8 @@
   @include m.data-visualization;
 
   .visualizations {
-    .visualizer-course-instructor-session-type,
-    .visualizer-course-instructor-term {
+    .course-visualize-instructor-session-type-graph,
+    .course-visualize-instructor-term-graph {
       height: 80vh;
       width: 80vw;
 
diff --git a/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-instructors.scss b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-instructors-graph.scss
similarity index 86%
rename from packages/ilios-common/app/styles/ilios-common/components/visualizer-course-instructors.scss
rename to packages/ilios-common/app/styles/ilios-common/components/course/visualize-instructors-graph.scss
index d02e6f1551..a8a1964a2e 100644
--- a/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-instructors.scss
+++ b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-instructors-graph.scss
@@ -1,4 +1,4 @@
-.visualizer-course-instructors {
+.course-visualize-instructors-graph {
   display: inline-block;
   height: 1rem;
   width: 1rem;
diff --git a/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-objectives.scss b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-objectives-graph.scss
similarity index 92%
rename from packages/ilios-common/app/styles/ilios-common/components/visualizer-course-objectives.scss
rename to packages/ilios-common/app/styles/ilios-common/components/course/visualize-objectives-graph.scss
index a8322566a3..f94b5d938a 100644
--- a/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-objectives.scss
+++ b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-objectives-graph.scss
@@ -1,7 +1,7 @@
-@use "../colors" as c;
-@use "../mixins" as m;
+@use "../../colors" as c;
+@use "../../mixins" as m;
 
-.visualizer-course-objectives {
+.course-visualize-objectives-graph {
   display: inline-block;
   height: 1rem;
   width: 1rem;
diff --git a/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-session-types.scss b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-session-type-graph.scss
similarity index 85%
rename from packages/ilios-common/app/styles/ilios-common/components/visualizer-course-session-types.scss
rename to packages/ilios-common/app/styles/ilios-common/components/course/visualize-session-type-graph.scss
index c14ffbda77..33c08b03d2 100644
--- a/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-session-types.scss
+++ b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-session-type-graph.scss
@@ -1,4 +1,4 @@
-.visualizer-course-session-types {
+.course-visualize-session-type-graph {
   display: inline-block;
   height: 1rem;
   width: 1rem;
diff --git a/packages/ilios-common/app/styles/ilios-common/components/course/visualize-session-types-graph.scss b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-session-types-graph.scss
new file mode 100644
index 0000000000..e9609c27e8
--- /dev/null
+++ b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-session-types-graph.scss
@@ -0,0 +1,19 @@
+.course-visualize-session-types-graph {
+  display: inline-block;
+  height: 1rem;
+  width: 1rem;
+
+  &.not-icon {
+    height: 75vh;
+    width: 75vw;
+
+    .simple-chart-tooltip {
+      .title {
+        p {
+          margin: 0;
+          padding: 0;
+        }
+      }
+    }
+  }
+}
diff --git a/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-term.scss b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-term-graph.scss
similarity index 88%
rename from packages/ilios-common/app/styles/ilios-common/components/visualizer-course-term.scss
rename to packages/ilios-common/app/styles/ilios-common/components/course/visualize-term-graph.scss
index ee369cdc2a..65a2808359 100644
--- a/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-term.scss
+++ b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-term-graph.scss
@@ -1,4 +1,4 @@
-.visualizer-course-term {
+.course-visualize-term-graph {
   display: inline-block;
   height: 1rem;
   width: 1rem;
diff --git a/packages/ilios-common/app/styles/ilios-common/components/course/visualize-vocabularies-graph.scss b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-vocabularies-graph.scss
new file mode 100644
index 0000000000..f8c3f14484
--- /dev/null
+++ b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-vocabularies-graph.scss
@@ -0,0 +1,19 @@
+.course-visualize-vocabularies-graph {
+  display: inline-block;
+  height: 1rem;
+  width: 1rem;
+
+  &.not-icon {
+    height: 75vh;
+    width: 75vw;
+
+    .simple-chart-tooltip {
+      .title {
+        p {
+          margin: 0;
+          padding: 0;
+        }
+      }
+    }
+  }
+}
diff --git a/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-session-type.scss b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-vocabulary-graph.scss
similarity index 86%
rename from packages/ilios-common/app/styles/ilios-common/components/visualizer-course-session-type.scss
rename to packages/ilios-common/app/styles/ilios-common/components/course/visualize-vocabulary-graph.scss
index 455d536f01..08009c5f0e 100644
--- a/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-session-type.scss
+++ b/packages/ilios-common/app/styles/ilios-common/components/course/visualize-vocabulary-graph.scss
@@ -1,4 +1,4 @@
-.visualizer-course-session-type {
+.course-visualize-vocabulary-graph {
   display: inline-block;
   height: 1rem;
   width: 1rem;
diff --git a/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-vocabularies.scss b/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-vocabularies.scss
deleted file mode 100644
index b875cfda4f..0000000000
--- a/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-vocabularies.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-.visualizer-course-vocabularies {
-  display: inline-block;
-  height: 1rem;
-  width: 1rem;
-
-  &.not-icon {
-    height: 75vh;
-    width: 75vw;
-
-    .simple-chart-tooltip {
-      .title {
-        p {
-          margin: 0;
-          padding: 0;
-        }
-      }
-    }
-  }
-}
diff --git a/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-vocabulary.scss b/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-vocabulary.scss
deleted file mode 100644
index 2e9a3e0097..0000000000
--- a/packages/ilios-common/app/styles/ilios-common/components/visualizer-course-vocabulary.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-.visualizer-course-vocabulary {
-  display: inline-block;
-  height: 1rem;
-  width: 1rem;
-
-  &.not-icon {
-    height: 75vh;
-    width: 75vw;
-
-    .simple-chart-tooltip {
-      .title {
-        p {
-          margin: 0;
-          padding: 0;
-        }
-      }
-    }
-  }
-}
diff --git a/packages/ilios-common/app/styles/ilios-common/mixins/objectives.scss b/packages/ilios-common/app/styles/ilios-common/mixins/objectives.scss
index 42481bc41e..86ecde0b12 100644
--- a/packages/ilios-common/app/styles/ilios-common/mixins/objectives.scss
+++ b/packages/ilios-common/app/styles/ilios-common/mixins/objectives.scss
@@ -21,7 +21,7 @@
         margin: 0 0.5em;
       }
 
-      .visualizer-course-objectives {
+      .course-visualize-objectives-graph {
         width: 2rem;
         height: 2rem;
       }
diff --git a/packages/test-app/tests/integration/components/course/visualize-instructor-session-type-graph-test.js b/packages/test-app/tests/integration/components/course/visualize-instructor-session-type-graph-test.js
new file mode 100644
index 0000000000..72a449bd23
--- /dev/null
+++ b/packages/test-app/tests/integration/components/course/visualize-instructor-session-type-graph-test.js
@@ -0,0 +1,74 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'test-app/tests/helpers';
+import { render, waitFor } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+import { setupMirage } from 'ember-cli-mirage/test-support';
+import { component } from 'ilios-common/page-objects/components/course/visualize-instructor-session-type-graph';
+
+module(
+  'Integration | Component | course/visualize-instructor-session-type-graph',
+  function (hooks) {
+    setupRenderingTest(hooks);
+    setupMirage(hooks);
+
+    test('it renders', async function (assert) {
+      const instructor = this.server.create('user');
+      const sessionType1 = this.server.create('session-type', {
+        title: 'Standalone',
+      });
+      const sessionType2 = this.server.create('session-type', {
+        title: 'Campaign',
+      });
+      const course = this.server.create('course');
+      const session1 = this.server.create('session', {
+        title: 'Berkeley Investigations',
+        course,
+        sessionType: sessionType1,
+      });
+      const session2 = this.server.create('session', {
+        title: 'The San Leandro Horror',
+        course,
+        sessionType: sessionType2,
+      });
+      this.server.create('offering', {
+        session: session1,
+        startDate: new Date('2019-12-08T12:00:00'),
+        endDate: new Date('2019-12-08T17:00:00'),
+        instructors: [instructor],
+      });
+      this.server.create('offering', {
+        session: session1,
+        startDate: new Date('2019-12-21T12:00:00'),
+        endDate: new Date('2019-12-21T17:30:00'),
+        instructors: [instructor],
+      });
+      this.server.create('offering', {
+        session: session2,
+        startDate: new Date('2019-12-05T18:00:00'),
+        endDate: new Date('2019-12-05T21:00:00'),
+        instructors: [instructor],
+      });
+
+      const courseModel = await this.owner.lookup('service:store').findRecord('course', course.id);
+      const instructorModel = await this.owner
+        .lookup('service:store')
+        .findRecord('user', instructor.id);
+
+      this.set('course', courseModel);
+      this.set('instructor', instructorModel);
+
+      await render(
+        hbs`<Course::VisualizeInstructorSessionTypeGraph @course={{this.course}} @user={{this.instructor}} @isIcon={{false}} />
+`,
+      );
+
+      //let the chart animations finish
+      await waitFor('.loaded');
+      await waitFor('svg .chart .slice');
+
+      assert.strictEqual(component.chart.slices.length, 2);
+      assert.strictEqual(component.chart.slices[0].text, 'Standalone 77.8%');
+      assert.strictEqual(component.chart.slices[1].text, 'Campaign 22.2%');
+    });
+  },
+);
diff --git a/packages/test-app/tests/integration/components/visualizer-course-instructor-term-test.js b/packages/test-app/tests/integration/components/course/visualize-instructor-term-graph-test.js
similarity index 91%
rename from packages/test-app/tests/integration/components/visualizer-course-instructor-term-test.js
rename to packages/test-app/tests/integration/components/course/visualize-instructor-term-graph-test.js
index cd5d440d15..a4271c19f0 100644
--- a/packages/test-app/tests/integration/components/visualizer-course-instructor-term-test.js
+++ b/packages/test-app/tests/integration/components/course/visualize-instructor-term-graph-test.js
@@ -3,9 +3,9 @@ import { setupRenderingTest } from 'test-app/tests/helpers';
 import { render, waitFor } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { setupMirage } from 'ember-cli-mirage/test-support';
-import { component } from 'ilios-common/page-objects/components/visualizer-course-instructor-term';
+import { component } from 'ilios-common/page-objects/components/course/visualize-instructor-term-graph';
 
-module('Integration | Component | visualizer-course-instructor-term', function (hooks) {
+module('Integration | Component | course/visualize-instructor-term-graph', function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
 
@@ -61,7 +61,7 @@ module('Integration | Component | visualizer-course-instructor-term', function (
     this.set('instructor', userModel);
 
     await render(
-      hbs`<VisualizerCourseInstructorTerm @course={{this.course}} @user={{this.instructor}} @isIcon={{false}} />
+      hbs`<Course::VisualizeInstructorTermGraph @course={{this.course}} @user={{this.instructor}} @isIcon={{false}} />
 `,
     );
     //let the chart animations finish
diff --git a/packages/test-app/tests/integration/components/visualizer-course-instructors-test.js b/packages/test-app/tests/integration/components/course/visualize-instructors-graph-test.js
similarity index 88%
rename from packages/test-app/tests/integration/components/visualizer-course-instructors-test.js
rename to packages/test-app/tests/integration/components/course/visualize-instructors-graph-test.js
index 09b96f7a2f..92ef6719ad 100644
--- a/packages/test-app/tests/integration/components/visualizer-course-instructors-test.js
+++ b/packages/test-app/tests/integration/components/course/visualize-instructors-graph-test.js
@@ -3,9 +3,9 @@ import { setupRenderingTest } from 'test-app/tests/helpers';
 import { render, waitFor } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { setupMirage } from 'ember-cli-mirage/test-support';
-import { component } from 'ilios-common/page-objects/components/visualizer-course-instructors';
+import { component } from 'ilios-common/page-objects/components/course/visualize-instructors-graph';
 
-module('Integration | Component | visualizer-course-instructors', function (hooks) {
+module('Integration | Component | course/visualize-instructors-graph', function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
 
@@ -51,7 +51,7 @@ module('Integration | Component | visualizer-course-instructors', function (hook
   test('it renders', async function (assert) {
     this.set('course', this.courseModel);
 
-    await render(hbs`<VisualizerCourseInstructors @course={{this.course}} @isIcon={{false}} />
+    await render(hbs`<Course::VisualizeInstructorsGraph @course={{this.course}} @isIcon={{false}} />
 `);
     //let the chart animations finish
     await waitFor('.loaded');
@@ -70,7 +70,7 @@ module('Integration | Component | visualizer-course-instructors', function (hook
     this.set('course', this.courseModel);
 
     await render(
-      hbs`<VisualizerCourseInstructors @course={{this.course}} @filter={{this.name}} @isIcon={{false}} />
+      hbs`<Course::VisualizeInstructorsGraph @course={{this.course}} @filter={{this.name}} @isIcon={{false}} />
 `,
     );
     //let the chart animations finish
@@ -86,7 +86,7 @@ module('Integration | Component | visualizer-course-instructors', function (hook
     this.set('course', this.courseModel);
 
     await render(
-      hbs`<VisualizerCourseInstructors @course={{this.course}} @isIcon={{false}} @chartType="donut" />
+      hbs`<Course::VisualizeInstructorsGraph @course={{this.course}} @isIcon={{false}} @chartType="donut" />
 `,
     );
     //let the chart animations finish
diff --git a/packages/test-app/tests/integration/components/visualizer-course-objectives-test.js b/packages/test-app/tests/integration/components/course/visualize-objectives-graph-test.js
similarity index 92%
rename from packages/test-app/tests/integration/components/visualizer-course-objectives-test.js
rename to packages/test-app/tests/integration/components/course/visualize-objectives-graph-test.js
index 0a70bdc059..62031b8f0b 100644
--- a/packages/test-app/tests/integration/components/visualizer-course-objectives-test.js
+++ b/packages/test-app/tests/integration/components/course/visualize-objectives-graph-test.js
@@ -3,9 +3,9 @@ import { setupRenderingTest } from 'test-app/tests/helpers';
 import { render, waitFor } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { setupMirage } from 'ember-cli-mirage/test-support';
-import { component } from 'ilios-common/page-objects/components/visualizer-course-objectives';
+import { component } from 'ilios-common/page-objects/components/course/visualize-objectives-graph';
 
-module('Integration | Component | visualizer-course-objectives', function (hooks) {
+module('Integration | Component | course/visualize-objectives-graph', function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
 
@@ -83,7 +83,7 @@ module('Integration | Component | visualizer-course-objectives', function (hooks
   test('it renders', async function (assert) {
     this.set('course', this.course);
     await render(
-      hbs`<VisualizerCourseObjectives @course={{this.course}} @isIcon={{false}} @showDataTable={{true}} />
+      hbs`<Course::VisualizeObjectivesGraph @course={{this.course}} @isIcon={{false}} @showDataTable={{true}} />
 `,
     );
     //let the chart animations finish
@@ -134,7 +134,7 @@ module('Integration | Component | visualizer-course-objectives', function (hooks
   test('sort data table by percentages', async function (assert) {
     this.set('course', this.course);
     await render(
-      hbs`<VisualizerCourseObjectives @course={{this.course}} @isIcon={{false}} @showDataTable={{true}} />
+      hbs`<Course::VisualizeObjectivesGraph @course={{this.course}} @isIcon={{false}} @showDataTable={{true}} />
 `,
     );
     assert.strictEqual(component.dataTable.rows[0].percentage, '77.8%');
@@ -153,7 +153,7 @@ module('Integration | Component | visualizer-course-objectives', function (hooks
   test('sort data-table by objectives', async function (assert) {
     this.set('course', this.course);
     await render(
-      hbs`<VisualizerCourseObjectives @course={{this.course}} @isIcon={{false}} @showDataTable={{true}} />
+      hbs`<Course::VisualizeObjectivesGraph @course={{this.course}} @isIcon={{false}} @showDataTable={{true}} />
 `,
     );
     assert.strictEqual(component.dataTable.rows[0].objective, 'course objective 0');
@@ -172,7 +172,7 @@ module('Integration | Component | visualizer-course-objectives', function (hooks
   test('sort data-table by competencies', async function (assert) {
     this.set('course', this.course);
     await render(
-      hbs`<VisualizerCourseObjectives @course={{this.course}} @isIcon={{false}} @showDataTable={{true}} />
+      hbs`<Course::VisualizeObjectivesGraph @course={{this.course}} @isIcon={{false}} @showDataTable={{true}} />
 `,
     );
     assert.strictEqual(component.dataTable.rows[0].competencies, 'competency 0, competency 1');
@@ -191,7 +191,7 @@ module('Integration | Component | visualizer-course-objectives', function (hooks
   test('sort data-table by sessions', async function (assert) {
     this.set('course', this.course);
     await render(
-      hbs`<VisualizerCourseObjectives @course={{this.course}} @isIcon={{false}} @showDataTable={{true}} />
+      hbs`<Course::VisualizeObjectivesGraph @course={{this.course}} @isIcon={{false}} @showDataTable={{true}} />
 `,
     );
     assert.strictEqual(component.dataTable.rows[0].sessions.text, 'Berkeley Investigations');
@@ -210,7 +210,7 @@ module('Integration | Component | visualizer-course-objectives', function (hooks
   test('sort data-table by minutes', async function (assert) {
     this.set('course', this.course);
     await render(
-      hbs`<VisualizerCourseObjectives @course={{this.course}} @isIcon={{false}} @showDataTable={{true}} />
+      hbs`<Course::VisualizeObjectivesGraph @course={{this.course}} @isIcon={{false}} @showDataTable={{true}} />
 `,
     );
     assert.strictEqual(component.dataTable.rows[0].minutes, '630');
@@ -269,7 +269,7 @@ module('Integration | Component | visualizer-course-objectives', function (hooks
 
     this.set('course', courseModel);
 
-    await render(hbs`<VisualizerCourseObjectives @course={{this.course}} @isIcon={{false}} />
+    await render(hbs`<Course::VisualizeObjectivesGraph @course={{this.course}} @isIcon={{false}} />
 `);
     assert.notOk(component.chart.isPresent);
     assert.ok(component.unlinkedObjectives.isPresent);
@@ -287,7 +287,7 @@ module('Integration | Component | visualizer-course-objectives', function (hooks
     const courseModel = await this.owner.lookup('service:store').findRecord('course', course.id);
     this.set('course', courseModel);
     await render(
-      hbs`<VisualizerCourseObjectives @course={{this.course}} @isIcon={{false}} @showDataTable={{true}} />
+      hbs`<Course::VisualizeObjectivesGraph @course={{this.course}} @isIcon={{false}} @showDataTable={{true}} />
 `,
     );
     assert.strictEqual(component.dataTable.rows.length, 2);
diff --git a/packages/test-app/tests/integration/components/visualizer-course-session-type-test.js b/packages/test-app/tests/integration/components/course/visualize-session-type-graph-test.js
similarity index 90%
rename from packages/test-app/tests/integration/components/visualizer-course-session-type-test.js
rename to packages/test-app/tests/integration/components/course/visualize-session-type-graph-test.js
index 61a1c22e20..4f4a5ede3a 100644
--- a/packages/test-app/tests/integration/components/visualizer-course-session-type-test.js
+++ b/packages/test-app/tests/integration/components/course/visualize-session-type-graph-test.js
@@ -3,9 +3,9 @@ import { setupRenderingTest } from 'test-app/tests/helpers';
 import { render, waitFor } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { setupMirage } from 'ember-cli-mirage/test-support';
-import { component } from 'ilios-common/page-objects/components/visualizer-course-session-type';
+import { component } from 'ilios-common/page-objects/components/course/visualize-session-type-graph';
 
-module('Integration | Component | visualizer-course-session-type', function (hooks) {
+module('Integration | Component | course/visualize-session-type-graph', function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
 
@@ -59,7 +59,7 @@ module('Integration | Component | visualizer-course-session-type', function (hoo
     this.set('type', sessionTypeModel);
 
     await render(
-      hbs`<VisualizerCourseSessionType @course={{this.course}} @sessionType={{this.type}} @isIcon={{false}} />
+      hbs`<Course::VisualizerSessionTypeGraph @course={{this.course}} @sessionType={{this.type}} @isIcon={{false}} />
 `,
     );
     //let the chart animations finish
diff --git a/packages/test-app/tests/integration/components/visualizer-course-session-types-test.js b/packages/test-app/tests/integration/components/course/visualize-session-types-graph-test.js
similarity index 86%
rename from packages/test-app/tests/integration/components/visualizer-course-session-types-test.js
rename to packages/test-app/tests/integration/components/course/visualize-session-types-graph-test.js
index 7b53ee407d..4ef559a90a 100644
--- a/packages/test-app/tests/integration/components/visualizer-course-session-types-test.js
+++ b/packages/test-app/tests/integration/components/course/visualize-session-types-graph-test.js
@@ -3,9 +3,9 @@ import { setupRenderingTest } from 'test-app/tests/helpers';
 import { render, waitFor } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { setupMirage } from 'ember-cli-mirage/test-support';
-import { component } from 'ilios-common/page-objects/components/visualizer-course-session-types';
+import { component } from 'ilios-common/page-objects/components/course/visualize-session-types-graph';
 
-module('Integration | Component | visualizer-course-session-types', function (hooks) {
+module('Integration | Component | course/visualize-session-types-graph', function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
 
@@ -49,7 +49,7 @@ module('Integration | Component | visualizer-course-session-types', function (ho
   test('it renders as bar chart by default', async function (assert) {
     this.set('course', this.courseModel);
 
-    await render(hbs`<VisualizerCourseSessionTypes @course={{this.course}} @isIcon={{false}} />
+    await render(hbs`<Course::VisualizeSessionTypesGraph @course={{this.course}} @isIcon={{false}} />
 `);
     //let the chart animations finish
     await waitFor('.loaded');
@@ -65,7 +65,7 @@ module('Integration | Component | visualizer-course-session-types', function (ho
     this.set('course', this.courseModel);
 
     await render(
-      hbs`<VisualizerCourseSessionTypes @course={{this.course}} @isIcon={{false}} @chartType="donut" />
+      hbs`<Course::VisualizeSessionTypesGraph @course={{this.course}} @isIcon={{false}} @chartType="donut" />
 `,
     );
     //let the chart animations finish
@@ -82,7 +82,7 @@ module('Integration | Component | visualizer-course-session-types', function (ho
     this.set('course', this.courseModel);
 
     await render(
-      hbs`<VisualizerCourseSessionTypes @course={{this.course}} @filter={{this.title}} @isIcon={{false}} />
+      hbs`<Course::VisualizeSessionTypesGraph @course={{this.course}} @filter={{this.title}} @isIcon={{false}} />
 `,
     );
     //let the chart animations finish
diff --git a/packages/test-app/tests/integration/components/visualizer-course-term-test.js b/packages/test-app/tests/integration/components/course/visualize-term-graph-test.js
similarity index 92%
rename from packages/test-app/tests/integration/components/visualizer-course-term-test.js
rename to packages/test-app/tests/integration/components/course/visualize-term-graph-test.js
index ba7258b66b..11cded2550 100644
--- a/packages/test-app/tests/integration/components/visualizer-course-term-test.js
+++ b/packages/test-app/tests/integration/components/course/visualize-term-graph-test.js
@@ -4,7 +4,7 @@ import { render, findAll, waitFor } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { setupMirage } from 'ember-cli-mirage/test-support';
 
-module('Integration | Component | visualizer-course-term', function (hooks) {
+module('Integration | Component | course/visualize-term-graph', function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
 
@@ -53,7 +53,7 @@ module('Integration | Component | visualizer-course-term', function (hooks) {
     this.set('term', termModel);
 
     await render(
-      hbs`<VisualizerCourseTerm @course={{this.course}} @term={{this.term}} @isIcon={{false}} />
+      hbs`<Course::VisualizeTermGraph @course={{this.course}} @term={{this.term}} @isIcon={{false}} />
 `,
     );
     //let the chart animations finish
diff --git a/packages/test-app/tests/integration/components/visualizer-course-vocabularies-test.js b/packages/test-app/tests/integration/components/course/visualize-vocabularies-graph-test.js
similarity index 89%
rename from packages/test-app/tests/integration/components/visualizer-course-vocabularies-test.js
rename to packages/test-app/tests/integration/components/course/visualize-vocabularies-graph-test.js
index e16c2b8bfa..d4233af87d 100644
--- a/packages/test-app/tests/integration/components/visualizer-course-vocabularies-test.js
+++ b/packages/test-app/tests/integration/components/course/visualize-vocabularies-graph-test.js
@@ -3,9 +3,9 @@ import { setupRenderingTest } from 'test-app/tests/helpers';
 import { render, waitFor } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { setupMirage } from 'ember-cli-mirage/test-support';
-import { component } from 'ilios-common/page-objects/components/visualizer-course-vocabularies';
+import { component } from 'ilios-common/page-objects/components/course/visualize-vocabularies-graph';
 
-module('Integration | Component | visualizer-course-vocabularies', function (hooks) {
+module('Integration | Component | course/visualize-vocabularies-graph', function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
 
@@ -49,7 +49,7 @@ module('Integration | Component | visualizer-course-vocabularies', function (hoo
 
     this.set('course', courseModel);
 
-    await render(hbs`<VisualizerCourseVocabularies @course={{this.course}} @isIcon={{false}} />
+    await render(hbs`<Course::VisualizeVocabulariesGraph @course={{this.course}} @isIcon={{false}} />
 `);
     //let the chart animations finish
     await waitFor('.loaded');
diff --git a/packages/test-app/tests/integration/components/visualizer-course-vocabulary-test.js b/packages/test-app/tests/integration/components/course/visualize-vocabulary-graph-test.js
similarity index 90%
rename from packages/test-app/tests/integration/components/visualizer-course-vocabulary-test.js
rename to packages/test-app/tests/integration/components/course/visualize-vocabulary-graph-test.js
index dcb64a8371..90f8bc2791 100644
--- a/packages/test-app/tests/integration/components/visualizer-course-vocabulary-test.js
+++ b/packages/test-app/tests/integration/components/course/visualize-vocabulary-graph-test.js
@@ -3,9 +3,9 @@ import { setupRenderingTest } from 'test-app/tests/helpers';
 import { render, waitFor } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { setupMirage } from 'ember-cli-mirage/test-support';
-import { component } from 'ilios-common/page-objects/components/visualizer-course-vocabulary';
+import { component } from 'ilios-common/page-objects/components/course/visualize-vocabulary-graph';
 
-module('Integration | Component | visualizer-course-vocabulary', function (hooks) {
+module('Integration | Component | course/visualize-vocabulary-graph', function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
 
@@ -57,7 +57,7 @@ module('Integration | Component | visualizer-course-vocabulary', function (hooks
     this.set('vocabulary', this.vocabularyModel);
 
     await render(
-      hbs`<VisualizerCourseVocabulary @course={{this.course}} @vocabulary={{this.vocabulary}} @isIcon={{false}} />
+      hbs`<Course::VisualizeVocabularyGraph @course={{this.course}} @vocabulary={{this.vocabulary}} @isIcon={{false}} />
 `,
     );
     //let the chart animations finish
diff --git a/packages/test-app/tests/integration/components/visualizer-course-instructor-session-type-test.js b/packages/test-app/tests/integration/components/visualizer-course-instructor-session-type-test.js
deleted file mode 100644
index 3c061ffac2..0000000000
--- a/packages/test-app/tests/integration/components/visualizer-course-instructor-session-type-test.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'test-app/tests/helpers';
-import { render, waitFor } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { component } from 'ilios-common/page-objects/components/visualizer-course-instructor-session-type';
-
-module('Integration | Component | visualizer-course-instructor-session-type', function (hooks) {
-  setupRenderingTest(hooks);
-  setupMirage(hooks);
-
-  test('it renders', async function (assert) {
-    const instructor = this.server.create('user');
-    const sessionType1 = this.server.create('session-type', {
-      title: 'Standalone',
-    });
-    const sessionType2 = this.server.create('session-type', {
-      title: 'Campaign',
-    });
-    const course = this.server.create('course');
-    const session1 = this.server.create('session', {
-      title: 'Berkeley Investigations',
-      course,
-      sessionType: sessionType1,
-    });
-    const session2 = this.server.create('session', {
-      title: 'The San Leandro Horror',
-      course,
-      sessionType: sessionType2,
-    });
-    this.server.create('offering', {
-      session: session1,
-      startDate: new Date('2019-12-08T12:00:00'),
-      endDate: new Date('2019-12-08T17:00:00'),
-      instructors: [instructor],
-    });
-    this.server.create('offering', {
-      session: session1,
-      startDate: new Date('2019-12-21T12:00:00'),
-      endDate: new Date('2019-12-21T17:30:00'),
-      instructors: [instructor],
-    });
-    this.server.create('offering', {
-      session: session2,
-      startDate: new Date('2019-12-05T18:00:00'),
-      endDate: new Date('2019-12-05T21:00:00'),
-      instructors: [instructor],
-    });
-
-    const courseModel = await this.owner.lookup('service:store').findRecord('course', course.id);
-    const instructorModel = await this.owner
-      .lookup('service:store')
-      .findRecord('user', instructor.id);
-
-    this.set('course', courseModel);
-    this.set('instructor', instructorModel);
-
-    await render(
-      hbs`<VisualizerCourseInstructorSessionType @course={{this.course}} @user={{this.instructor}} @isIcon={{false}} />
-`,
-    );
-
-    //let the chart animations finish
-    await waitFor('.loaded');
-    await waitFor('svg .chart .slice');
-
-    assert.strictEqual(component.chart.slices.length, 2);
-    assert.strictEqual(component.chart.slices[0].text, 'Standalone 77.8%');
-    assert.strictEqual(component.chart.slices[1].text, 'Campaign 22.2%');
-  });
-});