Added protection for unwanted renaming