Fix to builder package+class name construction