Naming convention horror.. And some cleanup
Merge pull request #1 from donseba/develop

Naming convention horror.. And some cleanup