Standardize on 'dp' and nuke 'dip' instances.