changed form and user.rb to updated street terminology