Fix manifest.yml to remove double underscores in variable names