Update .gitignore
Fix some naming
Convention fixes