Update FunctionFlip for new naming conventions
Merge pull request #1634 from Cottser/functionflip

Update FunctionFlip for new naming conventions