Changed settings to use .NET conventions