Rename also extra flags constants