Merge "OMS: rename methods to include package downgrades"