Shorten field names a bit