Revert "quick and dirty hack around trucks with ' in the name"

This reverts commit 31e439114c94b18f265c6a4aa545dda670e7bc33.
Redesigned configuration