diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java
index 89911e01cde97..217cf701b2659 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java
@@ -81,7 +81,7 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey
     abstract void resetState();
 
     @Override
-    public void initInternal() {
+    public void onInit() {
         mMessageAreaController.init();
     }
 
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
index ea9883023a7c1..ed0317c11f71d 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
@@ -92,7 +92,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
      * Attach the controller to the view it relates to.
      */
     @Override
-    public void initInternal() {
+    public void onInit() {
         mKeyguardSliceViewController.init();
     }
 
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java
index 1d12c1a7abdfe..3fafa5c606bd4 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java
@@ -178,7 +178,7 @@ public class KeyguardHostViewController extends ViewController<KeyguardHostView>
     }
 
     /** Initialize the Controller. */
-    public void initInternal() {
+    public void onInit() {
         mKeyguardSecurityContainerController.init();
     }
 
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java
index 94913c80ac5c3..730c177879086 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java
@@ -190,8 +190,8 @@ public class KeyguardPatternViewController
     }
 
     @Override
-    public void initInternal() {
-        super.initInternal();
+    public void onInit() {
+        super.onInit();
         mMessageAreaController.init();
     }
 
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
index e9173a3ca3a0b..9a511502b475b 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
@@ -169,7 +169,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
     }
 
     @Override
-    public void initInternal() {
+    public void onInit() {
         mSecurityViewFlipperController.init();
     }
 
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
index 0a57b09a55415..a45d712fc2449 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
@@ -70,7 +70,7 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
     }
 
     @Override
-    public void initInternal() {
+    public void onInit() {
         mKeyguardClockSwitchController.init();
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSContainerImplController.java b/packages/SystemUI/src/com/android/systemui/qs/QSContainerImplController.java
index 34ebe3e202e1f..4b9f4316f2bf2 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSContainerImplController.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSContainerImplController.java
@@ -34,7 +34,7 @@ public class QSContainerImplController extends ViewController<QSContainerImpl> {
     }
 
     @Override
-    public void initInternal() {
+    public void onInit() {
         mQuickStatusBarHeaderController.init();
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/util/ViewController.java b/packages/SystemUI/src/com/android/systemui/util/ViewController.java
index e8b837ee5bed1..880d09abeb607 100644
--- a/packages/SystemUI/src/com/android/systemui/util/ViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/util/ViewController.java
@@ -26,7 +26,7 @@ import android.view.View.OnAttachStateChangeListener;
  *
  * Implementations should handle setup and teardown related activities inside of
  * {@link #onViewAttached()} and {@link  #onViewDetached()}. Be sure to call {@link #init()} on
- * any child controllers that this uses. This can be done in {@link #initInternal()} if the
+ * any child controllers that this uses. This can be done in {@link #onInit()} if the
  * controllers are injected, or right after creation time of the child controller.
  *
  * Tip: View "attachment" happens top down - parents are notified that they are attached before
@@ -66,14 +66,14 @@ public abstract class ViewController<T extends View> {
      * Call immediately after constructing Controller in order to handle view lifecycle events.
      *
      * Generally speaking, you don't want to override this method. Instead, override
-     * {@link #initInternal()} as a way to have an run-once idempotent method that you can use for
+     * {@link #onInit()} as a way to have an run-once idempotent method that you can use for
      * setup of your ViewController.
      */
     public void init() {
         if (mInited) {
             return;
         }
-        initInternal();
+        onInit();
         mInited = true;
 
         if (mView != null) {
@@ -90,7 +90,7 @@ public abstract class ViewController<T extends View> {
      * Override this to perform idempotent, one-time setup that your controller needs. It will
      * be called before {@link #onViewAttached()}.
      */
-    protected void initInternal() {}
+    protected void onInit() {}
 
     protected Context getContext() {
         return mView.getContext();