changed key names for consistency