Rename classes to match spec.