Changed image naming strategy.