Revise for UUIDs instead of names. Couldn't figure out removing of one
deprecated method on line 423.