Rename flags variables