some renames and opmodel validation v1