Change namespace and small fix