[refac] globally use short-names