Merge "Rename key declaration to start with "KEY""