Fixed model

Renamed model methods to match test that are already written.