Change to use UID instead of name