changing variable names to build on Ubuntu.