cleaning up image naming structure