Fixing some renamings for what I refactored yesterday.