61,62c61
< cxx_namespace = 'X86ISA'
< cxx_class = 'E820Entry'
---
> cxx_class = 'X86ISA::E820Entry'
70,71c69
< cxx_namespace = 'X86ISA'
< cxx_class = 'E820Table'
---
> cxx_class = 'X86ISA::E820Table'