Change namespace of some vars