Merge "Power: Naming convention change"