fix model name assignment
set model name in filenames, etc