Fixed up more of aliases