Renaming and a few comments