accomodate name and terminology changes