Add component id to persistence name.

Need to distinguish between persistence of same type used by multiple instances of same component.