Renaming and null-safety