Rename basicCommands to basic_commands