changes in o2m and m2m to follow the similar naming convention as for m2o
better examples