fix complex types names