Fix : Additionally avoiding naming collisions between core and native enums