Changed property names (ec2. prefix)