Updating flavor to use names