Classes missed from the namespace implementation
Updated uses of class names within files to use namespace class names