fixed some missed renamings