fix error message names
revert error code changes
Merge branch 'cmake' into develop