update models to use underscores in names