diff --git a/devops-service/providers/ec2.rb b/devops-service/providers/ec2.rb
index d25e16e..29311d5 100644
--- a/devops-service/providers/ec2.rb
+++ b/devops-service/providers/ec2.rb
@@ -1,3 +1,4 @@
+require "exceptions/conflict_exception"
 require "providers/base_provider"
 
 module Provider
@@ -184,14 +185,12 @@ module Provider
     end
 
     def set_tags instance_id, tags
-      #TODO: raise error, unavailable tag name
-#      tags.delete("Name")
+      raise ConflictException.new("You can not change 'Name' tag") if tags.key?("Name")
       compute.create_tags(instance_id, tags)
     end
 
     def unset_tags instance_id, tags
-      #TODO: raise error, unavailable tag name
-#      tags.delete("Name")
+      raise ConflictException.new("You can not change 'Name' tag") if tags.key?("Name")
       compute.delete_tags(instance_id, tags)
     end