[neil, kelvin] rename district column