tweaks to some variable names since windows has a problem with them