Fixing handler names