Remove underscores from type/class names.
Add sections to VmType.