Rename and reorganize the -ir conjugators a bit