Fix renaming issues