Fix term names according to specification.
Fix term names according to specification.

Closes #38

EGI-FCTF/occi-os,alvarolopez/occi-os,tmetsch/occi-os,enolfc/occi-os,tmetsch/occi-os,EGI-FCTF/occi-os,alvarolopez/occi-os,enolfc/occi-os