Change renameKey method
Minimize code in keysController