A bit of housecleaning, naming consistancy.