Merge pull request #41 from mabrains/prim_naming

Updating primitive names