Cleaned up config file name determination