revert filename changes
improved template matching