Changed image naming strategy