moving out a few more aliases