Fix to replace proper namespace