Namespace, endpoints fixed