Shorten some entity table names