Add an option to handle renamed commands