Minor changes in naming conventions.