Some renaming and comments