Changed some names to not conflict with existing stack, change
xaDHCPOption2 to use modular referencing