part way through updating model and analysis names