Switch default config to use new constructor naming pattern