more renamings
massive reworking of MacaroonsBuilder to make modifiying work again