MASTER: Changed a class from a specific name to a more general one.