Corrected classmap and namespace