Changed type name to not cause name conflicts