Update: avoid error with redefinition of struct by renaming it