First pass of integrating reference to the new name and description computation spec.