changed naming
Did some refactoring
Merge branch 'master' of https://github.com/triforkamsterdam/BrightcenterSDK-Android