EUCA-7196
Added labels to properties file and corrected template refs.