Fine tuned naming and configuration.