Update to variable names to match new blender convention