Minor changes and renaming