Switch to variables to allow Ubuntu 12 support