Make train types shorter
Reorder