Changed naming convention to be more clear
Bug fixes
Changed naming conventions