Fix naming conflicts between config files and built-ins