A few more renamable items.