Renaming and some updates