Include the type name in builder objects