Renamed keys: more generic naming