Renaming issues fixed