Renaming as per version