Fixed some renaming issues