Changed some small-case variable names to upper-case.
Still testing on other distros.