Change namespace setup