Fix config file name
merge upstream