Rename flat to reflect change in semantics