Renaming to removing conflict