[rename] Rename modules with shorter names, related to #187461 [rejected]