Fix naming in handlers