Revert "Replaced templates functions"

This reverts commit 4ce301a08065ebaf931a97a89cec09fd2ba13108.
Reverted template function names for @jameskoster's sanity