Updates on object naming, especially escape and generate block names ...