Lots of renaming to get rid of duplicate commands.