Merge "Rename the subscriber map to be a more generic config file."