fixed bug where generated column names were too long.

Change-Id: Ied72d3d99a572d41dbe3ecafcba23e006931d87e