Renaming of the grammar to C2P naming standard
Second commit
Comment try