renamed some variables to work with the new object naming convention.  There might be more renamings that need to be done to get all scripts to work.