Removing mesos terminology