Improved generated default alias name in model class code