Fixed image naming problems