minor changes in naming