Naming stuff was a real challenge with this bundle. Alot of the logical names were already taken by other CMF things.

BuilderUnits might make more sense, but again I would prefer to wait until after refactoring before changing anything like that.