HV-373 Consistent naming of Builder classes and verification that constructors/methods are only defined once per bean