Fixes #2356 - Changed _id suffixes to _guid for variables when relevant