Fixed the longer names. Need to re-run to make the db.