Renamed base templates for server settings (from serverSettingsBase to server-settings-base) and site settings (from siteSettingsBase to site-settings-base) to avoid lower/upper case issues when creating them.