Renamed the models, and added VariableModel.