Fixed two renamings I missed