Separate views renaming in a new upgrade (v6)