Previously we used "bundle" as the parameter name, but it is likely to
collide with fields from the annotated superclass. Now we add a _
suffix, so such collisions can be avoided.