File names in model are inconsistant.

Function for picking up file names is more robust to handle that.