Minor changes in naming.