Fix struct name collision