Edit variable names

Changed variable names to make them more descriptive 
Also a couple of the names are not in CamelHump style