diff --git a/js/buttons/BooleanRectangularToggleButton.ts b/js/buttons/BooleanRectangularToggleButton.ts
index 44261adc..f0d67e60 100644
--- a/js/buttons/BooleanRectangularToggleButton.ts
+++ b/js/buttons/BooleanRectangularToggleButton.ts
@@ -36,8 +36,7 @@ export default class BooleanRectangularToggleButton extends RectangularToggleBut
 
     const options = optionize<BooleanRectangularToggleButtonOptions, SelfOptions, RectangularToggleButtonOptions>()( {
       content: content,
-      tandem: Tandem.REQUIRED,
-      tandemNameSuffix: 'Button'
+      tandem: Tandem.REQUIRED
     }, providedOptions );
 
     super( booleanProperty, false, true, options );
diff --git a/js/buttons/BooleanRoundToggleButton.ts b/js/buttons/BooleanRoundToggleButton.ts
index a62000da..025d696c 100644
--- a/js/buttons/BooleanRoundToggleButton.ts
+++ b/js/buttons/BooleanRoundToggleButton.ts
@@ -27,15 +27,14 @@ class BooleanRoundToggleButton extends RoundToggleButton<boolean> {
    * @param booleanProperty
    * @param trueNode - shown when booleanProperty is true
    * @param falseNode - shown when booleanProperty is false
-   * @param providedOptions?
+   * @param [providedOptions]
    */
   public constructor( booleanProperty: Property<boolean>, trueNode: Node, falseNode: Node,
                       providedOptions?: BooleanRoundToggleButtonOptions ) {
 
     const options = optionize<BooleanRoundToggleButtonOptions, SelfOptions, RoundToggleButtonOptions>()( {
       content: null,
-      tandem: Tandem.REQUIRED,
-      tandemNameSuffix: 'Button'
+      tandem: Tandem.REQUIRED
     }, providedOptions );
 
     const toggleNode = new BooleanToggleNode( booleanProperty, trueNode, falseNode, {
diff --git a/js/buttons/ButtonNode.ts b/js/buttons/ButtonNode.ts
index 440cc929..24d259c9 100644
--- a/js/buttons/ButtonNode.ts
+++ b/js/buttons/ButtonNode.ts
@@ -154,6 +154,7 @@ export default class ButtonNode extends Sizable( Voicing( Node ) ) {
       tagName: 'button',
 
       // phet-io
+      tandemNameSuffix: 'Button',
       visiblePropertyOptions: { phetioFeatured: true },
       phetioEnabledPropertyInstrumented: true // opt into default PhET-iO instrumented enabledProperty
     }, providedOptions );
diff --git a/js/buttons/RectangularMomentaryButton.ts b/js/buttons/RectangularMomentaryButton.ts
index edc2d42a..53895f36 100644
--- a/js/buttons/RectangularMomentaryButton.ts
+++ b/js/buttons/RectangularMomentaryButton.ts
@@ -36,8 +36,7 @@ export default class RectangularMomentaryButton<T> extends RectangularButton {
   public constructor( property: TProperty<T>, valueOff: T, valueOn: T, providedOptions?: RectangularMomentaryButtonOptions ) {
 
     const options = optionize<RectangularMomentaryButtonOptions, SelfOptions, RectangularButtonOptions>()( {
-      tandem: Tandem.REQUIRED,
-      tandemNameSuffix: 'Button'
+      tandem: Tandem.REQUIRED
     }, providedOptions );
 
     // Note it shares a tandem with this, so the emitter will be instrumented as a child of the button
diff --git a/js/buttons/RectangularPushButton.ts b/js/buttons/RectangularPushButton.ts
index f3c0c63b..63202841 100644
--- a/js/buttons/RectangularPushButton.ts
+++ b/js/buttons/RectangularPushButton.ts
@@ -36,8 +36,7 @@ export default class RectangularPushButton extends RectangularButton {
 
     const options = optionize<RectangularPushButtonOptions, SelfOptions, SuperOptions>()( {
       soundPlayer: pushButtonSoundPlayer,
-      tandem: Tandem.REQUIRED,
-      tandemNameSuffix: 'Button'
+      tandem: Tandem.REQUIRED
     }, providedOptions );
 
     // Save the listener and add it after creating the button model.  This is done so that
diff --git a/js/buttons/RectangularToggleButton.ts b/js/buttons/RectangularToggleButton.ts
index 68b7ebfc..5d0b2330 100644
--- a/js/buttons/RectangularToggleButton.ts
+++ b/js/buttons/RectangularToggleButton.ts
@@ -36,7 +36,7 @@ export default class RectangularToggleButton<T> extends RectangularButton {
    * @param property - axon Property that can be either valueOff or valueOn
    * @param valueOff - value when the button is in the off state
    * @param valueOn - value when the button is in the on state
-   * @param providedOptions?
+   * @param [providedOptions]
    */
   public constructor( property: Property<T>, valueOff: T, valueOn: T, providedOptions?: RectangularButtonOptions ) {
 
@@ -48,8 +48,7 @@ export default class RectangularToggleButton<T> extends RectangularButton {
 
       // phet-io support
       tandem: Tandem.REQUIRED,
-      phetioFeatured: true,
-      tandemNameSuffix: 'Button'
+      phetioFeatured: true
     }, providedOptions );
 
     // Note it shares a tandem with this, so the emitter will be instrumented as a child of the button
diff --git a/js/buttons/RoundMomentaryButton.ts b/js/buttons/RoundMomentaryButton.ts
index 2dd081b3..dbb48322 100644
--- a/js/buttons/RoundMomentaryButton.ts
+++ b/js/buttons/RoundMomentaryButton.ts
@@ -35,8 +35,7 @@ export default class RoundMomentaryButton<T> extends RoundButton {
   public constructor( property: TProperty<T>, valueOff: T, valueOn: T, providedOptions?: RoundMomentaryButtonOptions ) {
 
     const options = optionize<RoundMomentaryButtonOptions, SelfOptions, RoundButtonOptions>()( {
-      tandem: Tandem.REQUIRED,
-      tandemNameSuffix: 'Button'
+      tandem: Tandem.REQUIRED
     }, providedOptions );
 
     // Note it shares a tandem with this, so the emitter will be instrumented as a child of the button
diff --git a/js/buttons/RoundPushButton.ts b/js/buttons/RoundPushButton.ts
index 030999c8..c848f166 100644
--- a/js/buttons/RoundPushButton.ts
+++ b/js/buttons/RoundPushButton.ts
@@ -37,8 +37,7 @@ export default class RoundPushButton extends RoundButton {
 
     const options = optionize<RoundPushButtonOptions, SelfOptions, SuperOptions>()( {
       soundPlayer: pushButtonSoundPlayer,
-      tandem: Tandem.REQUIRED,
-      tandemNameSuffix: 'Button'
+      tandem: Tandem.REQUIRED
     }, providedOptions );
 
     // Save the listener and add it after creating the button model. This is done so that
diff --git a/js/buttons/RoundStickyToggleButton.ts b/js/buttons/RoundStickyToggleButton.ts
index 8b08a5b0..d764c501 100644
--- a/js/buttons/RoundStickyToggleButton.ts
+++ b/js/buttons/RoundStickyToggleButton.ts
@@ -42,8 +42,7 @@ export default class RoundStickyToggleButton<T> extends RoundButton {
       soundPlayer: pushButtonSoundPlayer,
 
       // RoundButtonOptions
-      tandem: Tandem.REQUIRED,
-      tandemNameSuffix: 'Button'
+      tandem: Tandem.REQUIRED
     }, providedOptions );
 
     // Note it shares a tandem with this, so the emitter will be instrumented as a child of the button
diff --git a/js/buttons/RoundToggleButton.ts b/js/buttons/RoundToggleButton.ts
index 3e9251f2..40fdd8e3 100644
--- a/js/buttons/RoundToggleButton.ts
+++ b/js/buttons/RoundToggleButton.ts
@@ -48,8 +48,7 @@ export default class RoundToggleButton<T> extends RoundButton {
 
       // phet-io support
       tandem: Tandem.REQUIRED,
-      phetioFeatured: true,
-      tandemNameSuffix: 'Button'
+      phetioFeatured: true
     }, providedOptions );
 
     // Note it shares a tandem with this, so the emitter will be instrumented as a child of the button
diff --git a/js/buttons/TextPushButton.ts b/js/buttons/TextPushButton.ts
index cab41110..9d3d1387 100644
--- a/js/buttons/TextPushButton.ts
+++ b/js/buttons/TextPushButton.ts
@@ -38,7 +38,6 @@ export default class TextPushButton extends RectangularPushButton {
 
       // RectangularPushButtonOptions
       tandem: Tandem.REQUIRED,
-      tandemNameSuffix: 'Button',
       innerContent: string
     }, providedOptions );