Merge pull request #7 from mabrains/prim_naming

Updating prim names