VT: districts are named properly now
MA: more district fixes