Fixed hash key names for consistency