Updating Some Templates
Simplifying URI "Name" Parameter