rename verbose inner builder classes to just 'Builder'