Try to eleviate name collisions.
Merge remote-tracking branch 'origin/hack-day' into hack-day