Change template namespace and update description