Renaming and minor changes