Refactor primitives to be named add_*