Renaming and some comments