Merge "libcorkscrew: avoid future name collisions."