More renaming for OWLAPI alignment