Fix error names a bit.