Update guide and namespace