Renaming and other minor changes