Changed XXXFactorySettings to XXXSettings.  Other minor changes.