Support EC2 instances, that include space in Name