Name change

Clean up names
Clean up language