updated cloudformation variable names