* Changes gitignore
* Updates naming conventions