diff --git a/docs/examples/gameofLife.md b/docs/examples/gameofLife.md
index 78eb9a93..93a6b049 100644
--- a/docs/examples/gameofLife.md
+++ b/docs/examples/gameofLife.md
@@ -22,13 +22,13 @@ Here's a program that simulates cell life in the LED matrix. Use button ``A`` fo
 let lifeChart: Image = null
 
 //Use button A for the next iteration of game of life
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     gameOfLife();
     show();
 })
 
 //Use button B for reseting to random initial seed state
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     reset();
     show();
 })
diff --git a/docs/projects/coin-flipper.md b/docs/projects/coin-flipper.md
index b65b36ff..5a9e1f6d 100644
--- a/docs/projects/coin-flipper.md
+++ b/docs/projects/coin-flipper.md
@@ -11,7 +11,7 @@ Let's create a coin flipping program to simulate a real coin toss. We'll use ico
 Get an ``||input:on button A pressed||`` block from the ``||input:Input||`` drawer in the toolbox. We'll put our coin flipping code in here.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
 })
 ```
 
@@ -22,7 +22,7 @@ Grab an ``||logic:if else||`` block and set it inside ``||input:on button A pres
 The ``||Math:pick random true or false||`` returns a random ``true`` or ``false`` value which we use to determine a ``heads`` or ``tails`` result for a coin toss.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     if (Math.randomBoolean()) {
     } else {
     }
@@ -34,7 +34,7 @@ input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
 Now, put a ``||basic:show icon||`` block inside both the ``||logic:if||`` and the ``||logic:else||``. Pick images to mean ``heads`` and ``tails``.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     if (Math.randomBoolean()) {
         basic.showIcon(IconNames.Skull)
     } else {
@@ -52,7 +52,7 @@ Press button **A** in the simulator to try the coin toss code.
 You can animate the coin toss to add the feeling of suspense. Place different ``||basic:show icon||`` blocks before the ``||logic:if||`` to show that the coin is flipping.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     basic.showIcon(IconNames.Diamond)
     basic.showIcon(IconNames.SmallDiamond)
     basic.showIcon(IconNames.Diamond)
diff --git a/docs/projects/mini-chat.md b/docs/projects/mini-chat.md
index 7cd388e8..9195baab 100644
--- a/docs/projects/mini-chat.md
+++ b/docs/projects/mini-chat.md
@@ -12,7 +12,7 @@ Use ``||input:on button pressed||`` to send a text message over radio with ``||r
 Every @boardname@ nearby will receive this message.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     radio.sendString("Yo");
 });
 ```
@@ -41,7 +41,7 @@ radio.onReceivedString(function (receivedString) {
 Press button **A** on the simulator, you will notice that a second @boardname@ appears (if your screen is too small, the simulator might decide not to show it). Try pressing **A** again and notice that the "Yo" message gets displayed on the other @boardname@.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     radio.sendString("Yo");
 });
 radio.onReceivedString(function (receivedString) {
diff --git a/docs/projects/smiley-buttons.md b/docs/projects/smiley-buttons.md
index 1ed6f803..1cacea48 100644
--- a/docs/projects/smiley-buttons.md
+++ b/docs/projects/smiley-buttons.md
@@ -12,7 +12,7 @@ Code the buttons on the @boardname@ to show that it's happy or sad.
 Place a ``||input:on button pressed||`` block to run code when button **A** is pressed.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => { 
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => { 
 });
 ```
 
@@ -21,7 +21,7 @@ input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
 Place a ``||basic:show leds||`` block inside ``||input:on button pressed||`` to display a smiley on the screen. Press the **A** button in the simulator to see the smiley.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => { 
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => { 
     basic.showLeds(`
         # # . # #
         # # . # #
@@ -37,7 +37,7 @@ input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
 Add ``||input:on button pressed||`` and ``||basic:show leds||`` blocks to display a frowny when button **B** is pressed.
 
 ```blocks
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => { 
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => { 
     basic.showLeds(`
         # # . # #
         # # . # #
@@ -53,7 +53,7 @@ input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
 Add a secret mode that happens when **A** and **B** are pressed together. For this case, add multiple ``||basic:show leds||`` blocks to create an animation.
 
 ```blocks
-input.input.onButtonEvent(Button.AB, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.AB, ButtonEvent.Click, () => {
     basic.showLeds(`
         . . . . .
         # . # . .
diff --git a/docs/projects/snap-the-dot.md b/docs/projects/snap-the-dot.md
index 02011e6a..d0e1915e 100644
--- a/docs/projects/snap-the-dot.md
+++ b/docs/projects/snap-the-dot.md
@@ -55,7 +55,7 @@ Use a ``||input:on button pressed||`` block to handle the **A** button. Put in a
 
 ```blocks
 let sprite: game.LedSprite = null
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, function () {
+input.onButtonEvent(Button.A, ButtonEvent.Click, function () {
     if (sprite.get(LedSpriteProperty.X) == 2) {
     } else {
     }
@@ -74,7 +74,7 @@ Finally, pull out an ``||game:add score||`` and a ``||game:game over||`` block t
 
 ```blocks
 let sprite: game.LedSprite = null
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, function () {
+input.onButtonEvent(Button.A, ButtonEvent.Click, function () {
     if (sprite.get(LedSpriteProperty.X) == 2) {
         game.addScore(1)
     } else {
diff --git a/docs/reference/basic/forever.md b/docs/reference/basic/forever.md
index 7e73b163..4babcb0a 100644
--- a/docs/reference/basic/forever.md
+++ b/docs/reference/basic/forever.md
@@ -43,7 +43,7 @@ let num = 0
 basic.forever(() => {
     basic.showNumber(num)
 })
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     num = num + 1
 })
 ```
@@ -59,7 +59,7 @@ Try this on your @boardname@:
 basic.forever(() => {
     basic.showNumber(6789)
 })
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     basic.showNumber(2)
 })
 ```
diff --git a/docs/reference/bluetooth/stop-advertising.md b/docs/reference/bluetooth/stop-advertising.md
index cbd4e731..464507cc 100644
--- a/docs/reference/bluetooth/stop-advertising.md
+++ b/docs/reference/bluetooth/stop-advertising.md
@@ -24,7 +24,7 @@ bluetooth.stopAdvertising();
 ## Example: stop advertising on button pressed
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     bluetooth.stopAdvertising();
 })
 ```
diff --git a/docs/reference/bluetooth/uart-write-line.md b/docs/reference/bluetooth/uart-write-line.md
index 865fd264..5387ef12 100644
--- a/docs/reference/bluetooth/uart-write-line.md
+++ b/docs/reference/bluetooth/uart-write-line.md
@@ -27,7 +27,7 @@ bluetooth.onBluetoothDisconnected(() => {
     basic.showString("D");
     connected = 0;
 });
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     if (connected == 1) {
         bluetooth.uartWriteLine("HELLO");
     }
diff --git a/docs/reference/bluetooth/uart-write-string.md b/docs/reference/bluetooth/uart-write-string.md
index f36655a6..46d4415e 100644
--- a/docs/reference/bluetooth/uart-write-string.md
+++ b/docs/reference/bluetooth/uart-write-string.md
@@ -27,7 +27,7 @@ bluetooth.onBluetoothDisconnected(() => {
     basic.showString("D");
     connected = 0;
 });
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     if (connected == 1) {
         bluetooth.uartWriteString("HELLO");
     }
diff --git a/docs/reference/control/in-background.md b/docs/reference/control/in-background.md
index 3801cd43..93b4dd57 100644
--- a/docs/reference/control/in-background.md
+++ b/docs/reference/control/in-background.md
@@ -29,7 +29,7 @@ control.inBackground(() => {
         basic.pause(100)
     }
 })
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     num++;
 })
 ```
@@ -42,7 +42,7 @@ let num = 0
 basic.forever(() => {
     basic.showNumber(num)
 })
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     num++;
 })
 ```
diff --git a/docs/reference/control/reset.md b/docs/reference/control/reset.md
index 3fc9388f..27dbf208 100644
--- a/docs/reference/control/reset.md
+++ b/docs/reference/control/reset.md
@@ -24,11 +24,11 @@ When you get tired of counting, press button `B` to reset the
 ```blocks
 let item = 0;
 basic.showNumber(item);
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     item = item + 1;
     basic.showNumber(item);
 });
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     control.reset();
 });
 ```
diff --git a/docs/reference/event-handler.md b/docs/reference/event-handler.md
index 217c23e7..65fcdde3 100644
--- a/docs/reference/event-handler.md
+++ b/docs/reference/event-handler.md
@@ -9,7 +9,7 @@ An event handler is code that is associated with a particular event, such as "bu
 Functions named "on <event>" create an association between an event and the event handler code.  For example, the following code registers the event handler (the code between the `do` and `end` keywords) with the event of a press of button A:
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     basic.showString("hello", 150)
 })
 ```
@@ -21,7 +21,7 @@ After this code executes, then whenever button A is pressed in the future, the s
 Once you have registered an event handler for an event, like above, that event handler is active for the rest of the program execution. If you want to stop the string "hello" from printing each time button A is pressed then you need to arrange for the following code to execute:
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
 })
 ```
 
@@ -32,10 +32,10 @@ The above code associated an event handler that does nothing with the event of a
 The above example also illustrates that there is only one event handler for each event. What is the result of the following code?
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     basic.showString("hello", 150)
 })
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     basic.showString("goodbye", 150)
 })
 ```
@@ -43,7 +43,7 @@ input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
 The answer is that whenever button A is pressed, the string "goodbye" will be printed. If you want both the strings "hello" and "goodbye" to be printed, you need to write the code like this:
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     basic.showString("hello", 150)
     basic.showString("goodbye", 150)
 })
diff --git a/docs/reference/game/add-score.md b/docs/reference/game/add-score.md
index d38fdebc..ead1649a 100644
--- a/docs/reference/game/add-score.md
+++ b/docs/reference/game/add-score.md
@@ -16,11 +16,11 @@ Press button ``A`` as much as possible to increase the score.
 Press ``B`` to display the score and reset the score.
 
 ```blocks
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     basic.showNumber(game.score())
     game.setScore(0)
 })
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     game.addScore(1)
 })
 ```
diff --git a/docs/reference/game/change-score-by.md b/docs/reference/game/change-score-by.md
index 3756157c..3ad51817 100644
--- a/docs/reference/game/change-score-by.md
+++ b/docs/reference/game/change-score-by.md
@@ -16,7 +16,7 @@ Press button ``A`` as much as possible.
 At the end of 10 seconds, the program will show your score.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     game.addScore(1)
 })
 game.startCountdown(10000)
diff --git a/docs/reference/game/clear.md b/docs/reference/game/clear.md
index 9a8b6c75..fcecfa2f 100644
--- a/docs/reference/game/clear.md
+++ b/docs/reference/game/clear.md
@@ -27,7 +27,7 @@ let img = images.createImage(`
 . . . . .
 `)
 img.showImage(0)
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     img.clear()
     img.showImage(0)
 })
diff --git a/docs/reference/game/game-over.md b/docs/reference/game/game-over.md
index bd2e3e2e..15f01fcd 100644
--- a/docs/reference/game/game-over.md
+++ b/docs/reference/game/game-over.md
@@ -14,10 +14,10 @@ If you press button `B`, it shows an animation and ends the game.
 
 ```blocks
 basic.showString("PICK A BUTTON");
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     basic.showString("YOU WIN!");
 });
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     game.gameOver();
 });
 ```
diff --git a/docs/reference/game/if-on-edge-bounce.md b/docs/reference/game/if-on-edge-bounce.md
index dfad29b3..9972be49 100644
--- a/docs/reference/game/if-on-edge-bounce.md
+++ b/docs/reference/game/if-on-edge-bounce.md
@@ -20,7 +20,7 @@ degrees -- exactly the opposite direction.
 ```blocks
 let ball = game.createSprite(4, 2);
 basic.showNumber(ball.get(LedSpriteProperty.Direction));
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     ball.ifOnEdgeBounce();
     basic.showNumber(ball.get(LedSpriteProperty.Direction));
 });
diff --git a/docs/reference/game/is-paused.md b/docs/reference/game/is-paused.md
index 0c820f52..ff5a7f46 100644
--- a/docs/reference/game/is-paused.md
+++ b/docs/reference/game/is-paused.md
@@ -15,7 +15,7 @@ game.isPaused()
 Resume the game if it's paused and button **B** is pressed.
 
 ```blocks
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, function () {
+input.onButtonEvent(Button.B, ButtonEvent.Click, function () {
 	if (game.isPaused()) {
         game.resume()
     }
diff --git a/docs/reference/game/is-running.md b/docs/reference/game/is-running.md
index f9d38972..2ceba3f3 100644
--- a/docs/reference/game/is-running.md
+++ b/docs/reference/game/is-running.md
@@ -15,7 +15,7 @@ game.isRunning()
 If the game is currently running, end the game if button **B** is pressed.
 
 ```blocks
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, function () {
+input.onButtonEvent(Button.B, ButtonEvent.Click, function () {
 	if (game.isRunning()) {
         game.gameOver()
     }
diff --git a/docs/reference/game/score.md b/docs/reference/game/score.md
index faab5c0d..2d7dcd47 100644
--- a/docs/reference/game/score.md
+++ b/docs/reference/game/score.md
@@ -13,7 +13,7 @@ This program adds one point to your score every time you press button
 second) and shows your score.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     game.addScore(1);
     basic.pause(500);
     basic.showNumber(game.score());
diff --git a/docs/reference/game/set-score.md b/docs/reference/game/set-score.md
index acdb65b5..b51e3a1a 100644
--- a/docs/reference/game/set-score.md
+++ b/docs/reference/game/set-score.md
@@ -16,11 +16,11 @@ Press button ``A`` as much as possible to increase the score.
 Press ``B`` to display the score and reset the score.
 
 ```blocks
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     basic.showNumber(game.score())
     game.setScore(0)
 })
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     game.addScore(1)
 })
 ```
diff --git a/docs/reference/game/start-countdown.md b/docs/reference/game/start-countdown.md
index 86a9be1c..d5cc0178 100644
--- a/docs/reference/game/start-countdown.md
+++ b/docs/reference/game/start-countdown.md
@@ -17,7 +17,7 @@ Press button ``A`` as much as possible.
 At the end of 10 seconds, the program will show your score.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     game.addScore(1)
 })
 game.startCountdown(10000)
diff --git a/docs/reference/images/arrow-image.md b/docs/reference/images/arrow-image.md
index 44d4d752..519afa7f 100644
--- a/docs/reference/images/arrow-image.md
+++ b/docs/reference/images/arrow-image.md
@@ -29,10 +29,10 @@ Display a left arrow when button A is pressed or a right arrow when button B is
 let arrowLeft = images.arrowImage(ArrowNames.West)
 let arrowRight = images.arrowImage(ArrowNames.East)
 
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     arrowLeft.showImage(0);
 });
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     arrowRight.showImage(0);
 });
 ```
diff --git a/docs/reference/images/create-big-image.md b/docs/reference/images/create-big-image.md
index 9f040579..5fd3ced8 100644
--- a/docs/reference/images/create-big-image.md
+++ b/docs/reference/images/create-big-image.md
@@ -36,10 +36,10 @@ let arrows = images.createBigImage(`
     . . # . .   . # # # .
     . . # . .   . . # . .
     `);
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     arrows.showImage(0);
 });
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     arrows.showImage(5);
 });
 ```
diff --git a/docs/reference/images/create-image.md b/docs/reference/images/create-image.md
index c89525a6..ce44163d 100644
--- a/docs/reference/images/create-image.md
+++ b/docs/reference/images/create-image.md
@@ -25,7 +25,7 @@ arrow and show it on the LED screen. If you press button `B`, the
 program will show a picture of the arrow upside-down.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     images.createImage(`
         . . # . .
         . # # # .
@@ -34,7 +34,7 @@ input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
         . . # . .
         `).showImage(0);
 });
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     images.createImage(`
         . . # . .
         . . # . .
diff --git a/docs/reference/images/icon-image.md b/docs/reference/images/icon-image.md
index 28b71f62..b6d48f51 100644
--- a/docs/reference/images/icon-image.md
+++ b/docs/reference/images/icon-image.md
@@ -20,10 +20,10 @@ Show a happy face when button A is pressed or a sad face when button B is presse
 let iamHappy = images.iconImage(IconNames.Happy)
 let iamSad = images.iconImage(IconNames.Sad)
 
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     iamHappy.showImage(0);
 });
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     iamSad.showImage(0);
 });
 ```
diff --git a/docs/reference/images/show-image.md b/docs/reference/images/show-image.md
index 87b7559e..ae8dd6cf 100644
--- a/docs/reference/images/show-image.md
+++ b/docs/reference/images/show-image.md
@@ -31,10 +31,10 @@ let arrows = images.createBigImage(`
     . . # . .   . # # # .
     . . # . .   . . # . .
     `);
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     arrows.showImage(0);
 });
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     arrows.showImage(5);
 });
 ```
diff --git a/docs/reference/input.md b/docs/reference/input.md
index 61c16f0a..16567982 100644
--- a/docs/reference/input.md
+++ b/docs/reference/input.md
@@ -3,7 +3,7 @@
 Events and data from sensors
 
 ```cards
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     
 });
 input.onGesture(Gesture.Shake, () => {
diff --git a/docs/reference/input/calibrate-compass.md b/docs/reference/input/calibrate-compass.md
index 8d4f4d6a..71e86dcc 100644
--- a/docs/reference/input/calibrate-compass.md
+++ b/docs/reference/input/calibrate-compass.md
@@ -23,7 +23,7 @@ confuse the @boardname@.
 This example runs the calibration when the user presses **A+B** buttons.
 
 ```blocks
-input.input.onButtonEvent(Button.AB, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.AB, ButtonEvent.Click, () => {
     input.calibrateCompass();
 })
 ```
diff --git a/docs/reference/input/compass-heading.md b/docs/reference/input/compass-heading.md
index cd6cfabd..62cbfe54 100644
--- a/docs/reference/input/compass-heading.md
+++ b/docs/reference/input/compass-heading.md
@@ -70,7 +70,7 @@ confuse the @boardname@.
 Keep the calibration handy by running it when the user pressed **A+B**.
 
 ```block
-input.input.onButtonEvent(Button.AB, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.AB, ButtonEvent.Click, () => {
     input.calibrateCompass();
 })
 ```
diff --git a/docs/reference/input/light-level.md b/docs/reference/input/light-level.md
index 9e5ac8ba..52360fb5 100644
--- a/docs/reference/input/light-level.md
+++ b/docs/reference/input/light-level.md
@@ -29,7 +29,7 @@ program shows the light level
 on the [LED screen](/device/screen).
 
 ```blocks
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     let level = input.lightLevel()
     basic.showNumber(level)
 })
diff --git a/docs/reference/input/on-button-pressed.md b/docs/reference/input/on-button-pressed.md
index 585cd930..13bae578 100644
--- a/docs/reference/input/on-button-pressed.md
+++ b/docs/reference/input/on-button-pressed.md
@@ -9,7 +9,7 @@ on the @boardname@.
 * For `A` and `B` together: This handler works when `A` and `B` are both pushed down, then one of them is released within 1.5 seconds of pushing down the second button.
 
 ```sig
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {})
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {})
 ```
 
 Find out how buttons provide input to the @boardname@ in this video:
@@ -24,7 +24,7 @@ Each time you press the button, the [LED screen](/device/screen) shows the `coun
 ```blocks
 let count = 0
 basic.showNumber(count)
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     count++;
     basic.showNumber(count);
 })
@@ -35,7 +35,7 @@ input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
 This example shows a number from 1 to 6 when you press the `B` button.
 
 ```blocks
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     let dice = Math.randomRange(0, 5) + 1
     basic.showNumber(dice)
 })
diff --git a/docs/reference/input/running-time.md b/docs/reference/input/running-time.md
index 67027af6..6cc79d57 100644
--- a/docs/reference/input/running-time.md
+++ b/docs/reference/input/running-time.md
@@ -18,7 +18,7 @@ program finds the number of milliseconds since the program started
 and shows it on the [LED screen](/device/screen).
 
 ```blocks
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     let now = input.runningTime()
     basic.showNumber(now)
 })
diff --git a/docs/reference/led/enable.md b/docs/reference/led/enable.md
index f78eacd2..4e02db14 100644
--- a/docs/reference/led/enable.md
+++ b/docs/reference/led/enable.md
@@ -15,7 +15,7 @@ led.enable(false);
 This program turns off the screen when pressing button ``B``
 
 ```blocks
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     led.enable(false)
 });
 ```
diff --git a/docs/reference/led/stop-animation.md b/docs/reference/led/stop-animation.md
index a6f7149c..1cd9159f 100644
--- a/docs/reference/led/stop-animation.md
+++ b/docs/reference/led/stop-animation.md
@@ -13,7 +13,7 @@ This program sets up the ``stop animation`` part of the program,
 and then shows a string that you can stop with button ``B``.
 
 ```blocks
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     led.stopAnimation();
 });
 basic.showString("STOP ME! STOP ME! PLEASE, WON'T SOMEBODY STOP ME?");
diff --git a/docs/reference/music/on-event.md b/docs/reference/music/on-event.md
index 0506df9c..b5655d7b 100644
--- a/docs/reference/music/on-event.md
+++ b/docs/reference/music/on-event.md
@@ -43,7 +43,7 @@ music.onEvent(MusicEvent.BackgroundMelodyResumed, () => {
 music.onEvent(MusicEvent.BackgroundMelodyRepeated, () => {
     serial.writeLine("background repeated")
 })
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     music.beginMelody(music.builtInMelody(Melodies.BaDing), MelodyOptions.Once)
 })
 music.setTempo(100)
diff --git a/docs/reference/music/set-play-tone.md b/docs/reference/music/set-play-tone.md
index f954e05d..8d8f5347 100644
--- a/docs/reference/music/set-play-tone.md
+++ b/docs/reference/music/set-play-tone.md
@@ -17,7 +17,7 @@ This example send the frequency and duration over radio
 and plays it on the remote @boardname@.
 
 ```typescript
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     music.playTone(440, 120)
     led.toggle(0, 0)
 })
@@ -26,7 +26,7 @@ radio.onReceivedNumber(function (receivedNumber) {
     const duration = receivedNumber & 0xffff;
     music.playTone(freq, duration);
 })
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     music.setPlayTone((frequency: number, duration: number) => {
         radio.sendNumber((frequency << 16) | (duration & 0xffff));
     })    
diff --git a/docs/reference/pins/digital-read-pin.md b/docs/reference/pins/digital-read-pin.md
index b2832a2e..9b0d6955 100644
--- a/docs/reference/pins/digital-read-pin.md
+++ b/docs/reference/pins/digital-read-pin.md
@@ -48,7 +48,7 @@ keeper @boardname@, you can press button `B` on the remote to buzz and
 make the score bigger on the other @boardname@.
 
 ```blocks
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     pins.digitalWritePin(DigitalPin.P1, 1);
     basic.pause(500);
     pins.digitalWritePin(DigitalPin.P1, 0);
diff --git a/docs/reference/pins/digital-write-pin.md b/docs/reference/pins/digital-write-pin.md
index 3841a927..2cc7a861 100644
--- a/docs/reference/pins/digital-write-pin.md
+++ b/docs/reference/pins/digital-write-pin.md
@@ -46,7 +46,7 @@ will use ``digital write pin`` to make the other @boardname@ buzz and
 make the score bigger.
 
 ```blocks
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     pins.digitalWritePin(DigitalPin.P1, 1);
     basic.pause(500);
     pins.digitalWritePin(DigitalPin.P1, 0);
diff --git a/docs/reference/radio/receive-string.md b/docs/reference/radio/receive-string.md
index bbe79cc6..c5ecbb2c 100644
--- a/docs/reference/radio/receive-string.md
+++ b/docs/reference/radio/receive-string.md
@@ -34,7 +34,7 @@ If you load this program onto two or more @boardname@s, you can send a code word
 The other @boardname@s will receive the code word and then show it.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     radio.sendString("Codeword: TRIMARAN")
     basic.showString("SENT");
 })
@@ -59,10 +59,10 @@ This program will also receive your friend's mood.
 
 ```blocks
 let data: string = "";
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     radio.sendString("H");
 });
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     radio.sendString("S");
 });
 radio.onDataReceived(() => {
diff --git a/docs/reference/radio/send-number.md b/docs/reference/radio/send-number.md
index 758fd179..a396efab 100644
--- a/docs/reference/radio/send-number.md
+++ b/docs/reference/radio/send-number.md
@@ -27,7 +27,7 @@ in the `x` direction (left and right) to other @boardname@s.  This kind
 of program might be useful in a model car or model rocket.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     radio.sendNumber(input.acceleration(Dimension.X))
 })
 ```
diff --git a/docs/reference/radio/send-string.md b/docs/reference/radio/send-string.md
index a4fd4dda..75e295e1 100644
--- a/docs/reference/radio/send-string.md
+++ b/docs/reference/radio/send-string.md
@@ -26,7 +26,7 @@ code word from one of them to the others by pressing button `A`.  The
 other @boardname@s will receive the code word and then show it.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     radio.sendString("Codeword: TRIMARAN")
     basic.showString("SENT");
 })
diff --git a/docs/reference/radio/send-value.md b/docs/reference/radio/send-value.md
index c6985098..bbcf4fd5 100644
--- a/docs/reference/radio/send-value.md
+++ b/docs/reference/radio/send-value.md
@@ -29,7 +29,7 @@ or model rocket.
 
 ```blocks
 radio.setGroup(99)
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     radio.sendValue("acc", input.acceleration(Dimension.X))
 })
 ```
diff --git a/docs/reference/radio/write-received-packet-to-serial.md b/docs/reference/radio/write-received-packet-to-serial.md
index d6d3bea4..7d7ca22a 100644
--- a/docs/reference/radio/write-received-packet-to-serial.md
+++ b/docs/reference/radio/write-received-packet-to-serial.md
@@ -30,7 +30,7 @@ the second @boardname@), this program sends temperature data to the
 serial port.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, function () {
+input.onButtonEvent(Button.A, ButtonEvent.Click, function () {
     radio.sendNumber(input.temperature())
     radio.sendValue("temp", input.temperature())
     radio.sendString("It's warm now")
diff --git a/docs/reference/radio/write-value-to-serial.md b/docs/reference/radio/write-value-to-serial.md
index 5b9d0a08..c3b0815e 100644
--- a/docs/reference/radio/write-value-to-serial.md
+++ b/docs/reference/radio/write-value-to-serial.md
@@ -29,7 +29,7 @@ the second @boardname@), this program sends temperature data to
 serial.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     radio.sendNumber(input.temperature());
 });
 radio.onDataReceived(() => {
diff --git a/docs/reference/serial/redirect.md b/docs/reference/serial/redirect.md
index 80928fa7..8a688b84 100644
--- a/docs/reference/serial/redirect.md
+++ b/docs/reference/serial/redirect.md
@@ -32,7 +32,7 @@ serial port to use the pins. The new configuration uses pin ``P1`` to transmit a
 ``P2`` to receive. The baud rate is set to `9600`.
 
 ```blocks
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     serial.redirect(SerialPin.P1, SerialPin.P2, BaudRate.BaudRate9600);
 });
 ```
diff --git a/docs/types/buffer/using-buffers.md b/docs/types/buffer/using-buffers.md
index c5711a64..5e112b7e 100644
--- a/docs/types/buffer/using-buffers.md
+++ b/docs/types/buffer/using-buffers.md
@@ -57,7 +57,7 @@ You could simply save the light measurements in an array like this:
 
 ```blocks
 let darkness: number[] = []
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     for (let i = 0; i < 60 * 4; i++) {
         darkness.push(input.lightLevel())
         basic.pause(60000)
@@ -77,7 +77,7 @@ The code in blocks for recording the light level is modified to make our file da
 
 ```typescript-ignore
 let darkness = pins.createBuffer(60 * 4);
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     for (let i = 0; i < 60 * 4; i++) {
         darkness.setNumber(NumberFormat.UInt8LE, i, input.lightLevel())
         basic.pause(60000)
@@ -90,7 +90,7 @@ Later, we can upload the file to the laptop computer by pressing the **B** butto
 ```typescript-ignore
 let dataReady = false;
 let darkness = pins.createBuffer(60 * 4);
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     for (let i = 0; i < 60 * 4; i++) {
         darkness.setNumber(NumberFormat.UInt8LE, i, input.lightLevel())
         basic.pause(60000)
@@ -98,7 +98,7 @@ input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     dataReady = true;
 })
 
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     if (dataReady) {
         serial.writeLine("Transferring file: DARKNESS, Length: " + darkness.length + " bytes...");
         serial.writeBuffer(darkness)
diff --git a/libs/radio-broadcast/docs/reference/radio/on-received-message.md b/libs/radio-broadcast/docs/reference/radio/on-received-message.md
index 6c28e670..fc6cbc0c 100644
--- a/libs/radio-broadcast/docs/reference/radio/on-received-message.md
+++ b/libs/radio-broadcast/docs/reference/radio/on-received-message.md
@@ -22,10 +22,10 @@ enum RadioMessage {
     heart,
     skull
 }
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, function () {
+input.onButtonEvent(Button.A, ButtonEvent.Click, function () {
     radio.sendMessage(RadioMessage.heart)
 })
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, function () {
+input.onButtonEvent(Button.B, ButtonEvent.Click, function () {
     radio.sendMessage(RadioMessage.skull)
 })
 radio.onReceivedMessage(RadioMessage.heart, function () {
diff --git a/libs/radio-broadcast/docs/reference/radio/send-message.md b/libs/radio-broadcast/docs/reference/radio/send-message.md
index 95f7f099..01058f11 100644
--- a/libs/radio-broadcast/docs/reference/radio/send-message.md
+++ b/libs/radio-broadcast/docs/reference/radio/send-message.md
@@ -20,10 +20,10 @@ enum RadioMessage {
     heart,
     skull
 }
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, function () {
+input.onButtonEvent(Button.A, ButtonEvent.Click, function () {
     radio.sendMessage(RadioMessage.heart)
 })
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, function () {
+input.onButtonEvent(Button.B, ButtonEvent.Click, function () {
     radio.sendMessage(RadioMessage.skull)
 })
 radio.onReceivedMessage(RadioMessage.heart, function () {
diff --git a/libs/radio/test.ts b/libs/radio/test.ts
index 20dc5b13..f5c7880c 100644
--- a/libs/radio/test.ts
+++ b/libs/radio/test.ts
@@ -332,12 +332,12 @@ function checkBufferEqual(a: Buffer, b: Buffer) {
     return true;
 }
 
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, function () {
+input.onButtonEvent(Button.A, ButtonEvent.Click, function () {
     basic.showString("S");
     initSender();
 })
 
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, function () {
+input.onButtonEvent(Button.B, ButtonEvent.Click, function () {
     basic.showString("R");
     initReceiver();
 })
diff --git a/tests/hat-game.ts b/tests/hat-game.ts
index 7a659e21..6fbb74bf 100644
--- a/tests/hat-game.ts
+++ b/tests/hat-game.ts
@@ -7,7 +7,7 @@ let level: number
 let swapSpeed: number
 
 initializeGame()
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     if (ballRevealing) {
         index = index + 1
         if (index > 2) {
@@ -16,7 +16,7 @@ input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
         basic.showString(cupSelect[index], 150)
     }
 })
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     if (ballRevealing) {
         ballRevealing = false
         if (correctBall == index) {
diff --git a/tests/meteorite.ts b/tests/meteorite.ts
index dfb0a264..a0ecd0d8 100644
--- a/tests/meteorite.ts
+++ b/tests/meteorite.ts
@@ -18,7 +18,7 @@ counter = 0
 pause = 700
 led.plot(oneX, oneY)
 led.plot(twoX, twoY)
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     if (oneX > 0) {
         led.unplot(oneX, oneY)
         led.unplot(twoX, twoY)
@@ -28,7 +28,7 @@ input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
         led.plot(twoX, twoY)
     }
 })
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     if (twoX < 4) {
         led.unplot(oneX, oneY)
         led.unplot(twoX, twoY)
diff --git a/tests/pac-man-runaway.ts b/tests/pac-man-runaway.ts
index a0999ffa..4c7c400b 100644
--- a/tests/pac-man-runaway.ts
+++ b/tests/pac-man-runaway.ts
@@ -107,12 +107,12 @@ basic.forever(() => {
         basic.pause(500)
     }
 })
-input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
     let temp = Math.abs(person.dirX) * (-1)
     person.dirX = Math.abs(person.dirY) * (-1)
     person.dirY = temp
 })
-input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
     let temp1 = Math.abs(person.dirX)
     person.dirX = Math.abs(person.dirY)
     person.dirY = temp1
diff --git a/tests/wg-canoe-polo-timer.ts b/tests/wg-canoe-polo-timer.ts
index c7f65e10..7edd3e1e 100644
--- a/tests/wg-canoe-polo-timer.ts
+++ b/tests/wg-canoe-polo-timer.ts
@@ -24,13 +24,13 @@ playOneGame(gameTime)
 showFinalScores(scoreA, scoreB)
 
 function startIOMonitor() {
-    input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+    input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
         AWasPressed = true
     })
-    input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+    input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
         BWasPressed = true
     })
-    input.input.onButtonEvent(Button.AB, ButtonEvent.Click, () => {
+    input.onButtonEvent(Button.AB, ButtonEvent.Click, () => {
         ABWasPressed = true
         AWasPressed = false
         BWasPressed = false
diff --git a/tests/wg-dr-who.ts b/tests/wg-dr-who.ts
index f41e7be7..1699b33c 100644
--- a/tests/wg-dr-who.ts
+++ b/tests/wg-dr-who.ts
@@ -501,13 +501,13 @@ function convertPenaltyTimeToScore(penaltyTime: number): number {
 }
 
 function startIOMonitor() {
-    input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+    input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
         AWasPressed = true
     })
-    input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+    input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
         BWasPressed = true
     })
-    input.input.onButtonEvent(Button.AB, ButtonEvent.Click, () => {
+    input.onButtonEvent(Button.AB, ButtonEvent.Click, () => {
         ABWasPressed = true
     })
     input.onShake(() => {
diff --git a/tests/wg-operation.ts b/tests/wg-operation.ts
index e5be568b..75eae609 100644
--- a/tests/wg-operation.ts
+++ b/tests/wg-operation.ts
@@ -377,11 +377,11 @@ function beepNTimesFor(times: number, duration: number) {
 
 function startIOMonitor() {
     aWasPressed = false
-    input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+    input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
         aWasPressed = true
     })
     bWasPressed = false
-    input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+    input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
         bWasPressed = true
     })
     wasTweezers = false
diff --git a/tests/wg-user-confidance.ts b/tests/wg-user-confidance.ts
index 83b9b188..c60e6f93 100644
--- a/tests/wg-user-confidance.ts
+++ b/tests/wg-user-confidance.ts
@@ -476,10 +476,10 @@ function testTiltZ() {
 }
 
 function startIOMonitor() {
-    input.input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
+    input.onButtonEvent(Button.A, ButtonEvent.Click, () => {
         AWasPressed = true
     })
-    input.input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
+    input.onButtonEvent(Button.B, ButtonEvent.Click, () => {
         BWasPressed = true
     })
     input.onShake(() => {