Better naming, and created a closed namespace
For #9-semweb-model