Code refactoring generalized the class Names specific to AwsEc2 to Ec2