Consolidate and extend the vocabulary of capacity