Corrected references to namespaced classes