Image naming is broken

[Nikos Efthimiou]

Proper incremental naming is very important when new instances are created.
We need something like:

Name  -> Name<1> -> Name<2> 
                Name<1><1> -> Name<1><2>