Change template param symbols for clarity