Revert "Ignoring templates now. Also using more readable name instead of identifier in output."

This reverts commit 27ad11c3e413c34dd210cbcaa26b27d6c4a25ca3.