Improved image naming consistency