Update exception naming