Dealing with some renaming issues