Adjustments for new command-interface

Following some renames.
Everything should work as before.