[TASK] Use namespaced class name