Fixed image naming issues