Fixed flip issue, some renaming