Fix invalid hash key names