Better handling of use_model_names and multi sensor in mapName()