Changed parser names

Getting to stable