Rename and refactor 2, remove un-needed 'SG' prefix

Also adds 100% more sensible and less confusing names