More rename-related changes