Re-name hooks to avoid name collisions