Changed up some naming and reduced the socket timeout to 1s