Code cleanup
Renamed DoF labels