Reintroduce long option names