Renaming method which was causing conflicts