Rename flags to abbrevation
Merged