The existing variable names swtpm and swtpm1 is confusing. Rename "swtpm" to "tpm_server" and "swtpm1" as "swtpm". Suggested-by: Ken Goldman <kgoldman@us.ibm.com> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>