Changed the cumbersome names