Revise variable names

Some of the naming of variables is inconsistent and unclear. Needs to be fixed to make code and output more understandable. Will likely cause errors with old code. Will be taken care of in the near future. 