translate some names from YML files
Merge remote-tracking branch 'origin/use_yml_data' into use_yml_data