Fixes #2356 - Changed _id suffixes to _guid for variables when relevant
Refs #2356 - Reverts invalid name changes
Merge pull request #6120 from Srokap/ticket_2356

Fixes #2356 - Prefers _guid over _id suffix for variables referring to guids