Updating Template

Using EU-West-1 
Some Name Changes