Rename: Class names in singular