More namechanges
Merge branch 'dev' of github.com:echel0n/SickRage into dev