[CLEANUP] Make use of class aliases