Changed template file names. Minor changes.