EMPIREDB-420
Exception names cleanup
17 files changed