Actually compute the correct names