Improve naming in parser and sql files
Merge pull request #58 from kaplali/fix_naming

Fix naming