MLDS-24 Consistent remove terminology