Name changes to match convention

Cleaning up and reorganizing.