Class renamings, preference manager modification