more exception naming fixes