tweak config and disambiguate config.h filename