Remove short form (-s) of --socket option and rename variable.