Fixed some struct naming conflicts