Renamed ClaimHandler to CmdClaimHandler.