Parser internal name refactoring.
Parser settings minor refactoring.