Changed names of some cfengine variables
Changed some variable names, also changed some paths to be correct