CSIT-597: revert to old style interface naming