Fix #39 - standardize interface names