ATEAM-380 Reordering properties and methods to be alphabetical