Change key names for better naming convention