Function renaming, added template for FIR