Change name, minor simplification.