Change namespace to match functions