rename all flags to unified naming conventions