Rename functions, classes and enums to avoid collisions with existing parser in other parts of the app
Add two missing files