More work on #32: Use division and position titles 
instead of short titles