replaced XxxSetBuilder with generic ArrayBuilder
name cleanup in Sandbox