Adding name convention for parser