Renamed some constants
Merge branch 'dev' of https://github.com/hx1997/RightsBox into dev