Simplify field name
Improve handling of bootstrap class loader