Index: wflow-py/wflow/wflow_bmi.py =================================================================== diff -u -r2b3c0c4f2d96ed7778f0a18a472f2a2fe3d1c8f4 -r92614a65d0550f3f7486f99ae45a76ca76b66022 --- wflow-py/wflow/wflow_bmi.py (.../wflow_bmi.py) (revision 2b3c0c4f2d96ed7778f0a18a472f2a2fe3d1c8f4) +++ wflow-py/wflow/wflow_bmi.py (.../wflow_bmi.py) (revision 92614a65d0550f3f7486f99ae45a76ca76b66022) @@ -33,7 +33,8 @@ def wflow_model(name): for model in wflow_models: - if name in model.__name__: + model_name = model.__name__.replace("wflow.wflow_", "", 1) + if model_name in name: return model model_names = [model.__name__ for model in wflow_models] raise ValueError("Model {} not recognized as one of {}".format(name, model_names))