Fixing how names are added to models. Closes #298