Fix renaming issues brought with model updates