Issue #342350 by Deciphered: Fixed Override template files based on template filename as well as hook name.