Changes ref to filenames
Renames model
Renames last bit
sets shortname optional
changes api names