Fixing flag naming inconsistency revealed by C++ build