feature #2289: refactor ec2 drivers to standard form