def fixName(s):
    """
    Hack. Some Astrobee commands have a parameter with id 'name_',
    which is a workaround for 'name' being a reserved word in XPJSON.
    For backward compatibility, we convert 'name_' to 'name' in some cases.
    """
    if s == 'name_':
        return 'name'
    else:
        return s