Renaming Simulator primitives

(references #166)
Renaming Simulator primitives and macros

(references #166)