Fine-tuning naming conventions.