Fix Naming Derps

Change-Id: I2b2f8032b44a23425d8fb18a9e1079c537d0e512