fixes some minor issues like file naming and model names