Changed option names across all files to resolve #37