Dynamic model names

Make the model names more dynamic less hard coded