re #842 - Renaming
Merge branch 'feature/842-districts' into staging