Fixed renaming issues (see last)