Update keywords to something more related to command line