Some renamings to make names eat up less window space.