last round of cleaning up interface names