Conformed everything to the new specs, also changed a few names to match
naming conventions.