Rename (commands, command_list) -> (command_dict, commands)