Looks like it's giving the right names now