Support for multiple definitions per term. Used Coding conventions

Change-Id: I4e1d0651b3d66bada92db9c3a1c76cdd6de1529c