@@ -151,7 +151,7 @@ class S3(object):

 	def object_delete_uri(self, uri):

 		if uri.type != "s3":

 			raise ValueError("Expected URI type 's3', got '%s'" % uri.type)

-		return self.object_delete(filename, uri.bucket(), uri.object())

+		return self.object_delete(uri.bucket(), uri.object())

 	## Low level methods

 	def create_request(self, operation, bucket = None, object = None, headers = None, **params):

@@ -35,7 +35,7 @@ class S3Uri(object):

 class S3UriS3(S3Uri):

 	type = "s3"

-	_re = re.compile("^s3://([^/]+)/?(.*)")

+	_re = re.compile("^s3://([^/]+)/?(.*)", re.IGNORECASE)

 	def __init__(self, string):

 		match = self._re.match(string)

 		if not match:

@@ -61,11 +61,11 @@ class S3UriS3(S3Uri):

 	@staticmethod

 	def compose_uri(bucket, object = ""):

-		return "S3://%s/%s" % (bucket, object)

+		return "s3://%s/%s" % (bucket, object)

 class S3UriS3FS(S3Uri):

 	type = "s3fs"

-	_re = re.compile("^s3fs://([^/]*)/?(.*)")

+	_re = re.compile("^s3fs://([^/]*)/?(.*)", re.IGNORECASE)

 	def __init__(self, string):

 		match = self._re.match(string)

 		if not match: