Merge "Remove the local cached name"