Renamed classes, to reflect the specification document.