* Added legacy code to preserve backwards compatibility * renamed some cli option names to better match option names