Change in ovirt-engine[master]: core: Cleanup method names II