Remove outdated terminology