Clearer district/state .name references