Shorten name
Change template name
Update usage to be cloud env specific