Updated class naming to use ClassNamer