Added missing calls to Zero() and switched Enum names to avoid naming conflicts with other software