Renamed a few of these to use the respective node name.