Removed plural from class names.