diff --git a/js/common/view/SpaceObjectsPropertyCheckbox.js b/js/common/view/CheckboxPanel.js
similarity index 97%
rename from js/common/view/SpaceObjectsPropertyCheckbox.js
rename to js/common/view/CheckboxPanel.js
index 1ad2a537..bd15a28c 100644
--- a/js/common/view/SpaceObjectsPropertyCheckbox.js
+++ b/js/common/view/CheckboxPanel.js
@@ -56,7 +56,7 @@ define( function( require ) {
    * @param {Object} [options]
    * @constructor
    */
-  function SpaceObjectsPropertyCheckbox( module, options ) {
+  function CheckboxPanel( module, options ) {
 
     var children = [];
 
@@ -149,5 +149,5 @@ define( function( require ) {
     }, options ) );
   }
 
-  return inherit( VBox, SpaceObjectsPropertyCheckbox );
+  return inherit( VBox, CheckboxPanel );
 } );
\ No newline at end of file
diff --git a/js/common/view/RightControlPanel.js b/js/common/view/RightControlPanel.js
index 0f61a75e..232d955e 100644
--- a/js/common/view/RightControlPanel.js
+++ b/js/common/view/RightControlPanel.js
@@ -15,7 +15,7 @@ define( function( require ) {
   var Rectangle = require( 'SCENERY/nodes/Rectangle' );
   var PlanetModeMenu = require( 'GRAVITY_AND_ORBITS/common/view/PlanetModeMenu' );
   var GravityModeMenu = require( 'GRAVITY_AND_ORBITS/common/view/GravityModeMenu' );
-  var SpaceObjectsPropertyCheckbox = require( 'GRAVITY_AND_ORBITS/common/view/SpaceObjectsPropertyCheckbox' );
+  var CheckboxPanel = require( 'GRAVITY_AND_ORBITS/common/view/CheckboxPanel' );
   var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsConstants' );
   var VBox = require( 'SCENERY/nodes/VBox' );
 
@@ -41,7 +41,7 @@ define( function( require ) {
       makeSeparatorRectangle(),
       new GravityModeMenu( module.gravityEnabledProperty, MENU_SECTION_OPTIONS ),
       makeSeparatorRectangle(),
-      new SpaceObjectsPropertyCheckbox( module, MENU_SECTION_OPTIONS )
+      new CheckboxPanel( module, MENU_SECTION_OPTIONS )
     ];
 
     assert && assert( sections.length === 5, 'There should be 5 sections in the RightControlPanel' );