Change to --file - to read from STDIN instead of automatically, rename other args for consistency

Change to --file - to read from STDIN instead of automatically, rename other args for consistency #1700