making the naming conventions consistent for the MPU