Fixed name errors in models