minor template and conf changes to use config properties than hardcoded names