Changing Names

Changed class names to reflect what the units are
Merge branch 'master' of https://github.com/JordanLingHua/projectH