simplify alias references
clean up and use consistent suffixes