Resolved concerns regarding unit deletion, and naming