Rename handlers to cmd