Changed property names (ec2. prefix)
Merge pull request #44 from gibello/master

Changed property names (ec2. prefix)