Changed flattening function names.