Change user_dojo commands to suit conventions