Removed "hydra" from most names.