Expand prefix on generated identifiers #625