Updated classes to match those output by ghost.