Renamed some MachineNode classes for consistency.