Refactor prefixing of type names in interface