Clean up template naming conventions
Choose the correct form for tostring (with params or without)