Fix cli overlay func to use the long cli name, switch correctly