Using short names for table generation.
Nicer formatting.