diff --git a/src/curp-command.proto b/src/curp-command.proto
index f01b73d..fc2391b 100644
--- a/src/curp-command.proto
+++ b/src/curp-command.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 
 package commandpb;
 
-import "error.proto";
+import "curp-error.proto";
 
 option go_package = ".;curpapi";
 
diff --git a/src/error.proto b/src/curp-error.proto
similarity index 100%
rename from src/error.proto
rename to src/curp-error.proto
diff --git a/src/message.proto b/src/message.proto
index 72d0ffb..4e3fd18 100644
--- a/src/message.proto
+++ b/src/message.proto
@@ -4,8 +4,8 @@ package messagepb;
 
 option go_package = ".;curpapi";
 
-import "command.proto";
-import "error.proto";
+import "curp-command.proto";
+import "curp-error.proto";
 import "google/protobuf/empty.proto";