Couple of renamings that got missed