more cleanup

Brought naming inline to be more consistent throughout the deserializer.