Make minor adjustments in naming