renaming all flat references to condense