Changed some configuration property names and defaults