Remove references to demo-X

Examples were renamed to descriptive names in bca54e2f, but they were
still referred by their former labels in places.

Still fixing #2.