Changed usage of euca and aws key properties