AI-736 Standardize the vocabulary used in the Classic and Flexible design modes.