use consistent variable naming
Revert "fixor'd the test case make config"

This reverts commit b78f08eebdfd7c4a85741d7d39e915bc342f5297.

Conflicts:

	nbproject/configurations.xml
Revert "config.xml refixes itself"

This reverts commit 04570951ee398c0e6f42b9068b3fe1e8648ec88b.

Conflicts:

	nbproject/configurations.xml