Improving model naming conventions