Revert rename of dph-common for now