Minor changes in naming