Remove some kit- prefixes.