Rename a class for clarity