Working toward using qualified version of a new name in the right places.