Fix namespace issues caused by previous commit