Correctly mark the UUID/name methods as NonNull