Changes
Changed names and fixed reward
Merge branch 'develop'