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