Fix minor renaming problems