Rename parser functions