Keep my super awesome naming convention

Change-Id: I1d7984c0f0e9112e4a2d0c17cc690c2671776b41