Fix copy-paste in analysis and model