Change name, change how data is passed, fix rspec