Consistent type names in error messages

Tests fixed with this sed script: https://gist.github.com/TazeTSchnitzel/c0d780466def9f226318