cleanup exception naming