More consistent config file naming, to avoid users from pushing their own