Changing the name of the hex class and one or two other things
Changing the filenames in line with previous commit
Make sure old filenames are purged from tracking
Fix errors and omissions in renaming