Merge "Rename private methods in DPE for clarity." into main