Systematize interop sub names and add short forms