I think both name changes should be made, posthaste.