Working on fixing image naming issue