Changes we did to get a proper merge with renames.