Merge pull request #10 from mabrains/prim_naming

Updating primitive names