Fix renaming problem