Fixed models, et al. for LOVs to not use the same field and class name (Issue created with some autogenerated code)