Move complex type name fixup into complex_types builder