Start updating obsolete naming.