renamming
 merging with master
Merge pull request #71 from troussil/PrimitivesRenaming

thank!