improves naming of variables

This changes names of a few variables and sets camel-casing for the names too.