Rename, starting with top fields