FIxed more renaming issues