Switch to using newer/shorter interface aliases