Convert to UUIDs

As we now know, names may not be reliable in the future. This prevents any mishaps with 1.8 and beyond!