Updated names to reflect better parser function name