improve naming and ordering