Fixed variable names to allow clean build

Some incorrect variable names were cause the build to fail.