diff --git a/core/input.ts b/core/input.ts
index 3cba37e69..5b69e566a 100644
--- a/core/input.ts
+++ b/core/input.ts
@@ -30,12 +30,13 @@ import type {RenderedConnection} from './rendered_connection.js';
  * @alias Blockly.Input
  */
 export class Input {
-  private sourceBlock_: Block;
+  private sourceBlock: Block;
   fieldRow: Field[] = [];
-  align: Align;
+  /** Alignment of input's fields (left, right or centre). */
+  align = Align.LEFT;
 
   /** Is the input visible? */
-  private visible_ = true;
+  private visible = true;
 
   /**
    * @param type The type of the input.
@@ -51,19 +52,16 @@ export class Input {
       throw Error(
           'Value inputs and statement inputs must have non-empty name.');
     }
-    this.sourceBlock_ = block;
-
-    /** Alignment of input's fields (left, right or centre). */
-    this.align = Align.LEFT;
+    this.sourceBlock = block;
   }
 
   /**
    * Get the source block for this input.
    *
-   * @returns The source block, or null if there is none.
+   * @returns The block this input is part of.
    */
   getSourceBlock(): Block {
-    return this.sourceBlock_;
+    return this.sourceBlock;
   }
 
   /**
@@ -109,8 +107,8 @@ export class Input {
       })!;
     }
 
-    field.setSourceBlock(this.sourceBlock_);
-    if (this.sourceBlock_.rendered) {
+    field.setSourceBlock(this.sourceBlock);
+    if (this.sourceBlock.rendered) {
       field.init();
       field.applyColour();
     }
@@ -129,10 +127,10 @@ export class Input {
       index = this.insertFieldAt(index, field.suffixField);
     }
 
-    if (this.sourceBlock_.rendered) {
-      (this.sourceBlock_ as BlockSvg).render();
+    if (this.sourceBlock.rendered) {
+      (this.sourceBlock as BlockSvg).render();
       // Adding a field will cause the block to change shape.
-      this.sourceBlock_.bumpNeighbours();
+      this.sourceBlock.bumpNeighbours();
     }
     return index;
   }
@@ -151,10 +149,10 @@ export class Input {
       if (field.name === name) {
         field.dispose();
         this.fieldRow.splice(i, 1);
-        if (this.sourceBlock_.rendered) {
-          (this.sourceBlock_ as BlockSvg).render();
+        if (this.sourceBlock.rendered) {
+          (this.sourceBlock as BlockSvg).render();
           // Removing a field will cause the block to change shape.
-          this.sourceBlock_.bumpNeighbours();
+          this.sourceBlock.bumpNeighbours();
         }
         return true;
       }
@@ -171,7 +169,7 @@ export class Input {
    * @returns True if visible.
    */
   isVisible(): boolean {
-    return this.visible_;
+    return this.visible;
   }
 
   /**
@@ -187,10 +185,10 @@ export class Input {
     // because this function is package. If this function goes back to being a
     // public API tests (lots of tests) should be added.
     let renderList: AnyDuringMigration[] = [];
-    if (this.visible_ === visible) {
+    if (this.visible === visible) {
       return renderList;
     }
-    this.visible_ = visible;
+    this.visible = visible;
 
     for (let y = 0, field; field = this.fieldRow[y]; y++) {
       field.setVisible(visible);
@@ -246,8 +244,8 @@ export class Input {
    */
   setAlign(align: Align): Input {
     this.align = align;
-    if (this.sourceBlock_.rendered) {
-      const sourceBlock = this.sourceBlock_ as BlockSvg;
+    if (this.sourceBlock.rendered) {
+      const sourceBlock = this.sourceBlock as BlockSvg;
       sourceBlock.render();
     }
     return this;
@@ -281,7 +279,7 @@ export class Input {
 
   /** Initialize the fields on this input. */
   init() {
-    if (!this.sourceBlock_.workspace.rendered) {
+    if (!this.sourceBlock.workspace.rendered) {
       return;  // Headless blocks don't need fields initialized.
     }
     for (let i = 0; i < this.fieldRow.length; i++) {