Made enumeration naming consistent.
Temp commit;changing PCs.