Change all structural "number" variables to "identifier"

Per #187.