diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm
index fc0f9f3..9452152 100644
--- a/gnu/packages/glicid.scm
+++ b/gnu/packages/glicid.scm
@@ -399,7 +399,7 @@
               (sha256
                (base32
                 "02ym93k6khfmzm9rml79x9zh1dy8231sygw16r287mhwp0x9mbji"))))
-      (inputs `(("gcc-10", gcc-10)
+      (inputs `(("gcc", gcc-10)
       ,@(package-inputs rdma-core)))
 
  )
@@ -419,8 +419,8 @@
        (sha256
         (base32 "13ymh0y3fsifvfv7hd3kqvdw1ywrsii4njm9c37qvsp753vanf4r"))))
 
-    (inputs `(("gcc-10", gcc-10)
-      ("glicid-specific-rdma-core-gcc-10", glicid-specific-rdma-core-gcc-10)
+    (inputs `(("gcc", gcc-10)
+      ("rdma-core", glicid-specific-rdma-core-gcc-10)
       ,@(package-inputs libfabric)))
  )
 )
@@ -437,10 +437,10 @@
     (sha256 (base32 "1yrmwvjxi3najax1wz4irpzxns6cp74ksdx4i1049mf03n2ci8m7"))
    ))
 
-  (inputs `(("gcc-10", gcc-10)
-            ("gfortran-10", gfortran-10)
-            ("glicid-specific-libfabric-gcc-10", glicid-specific-libfabric-gcc-10)
-	    ("glicid-specific-rdma-core-gcc-10",glicid-specific-rdma-core-gcc-10)
+  (inputs `(("gcc", gcc-10)
+            ("gfortran", gfortran-10)
+            ("libfabric", glicid-specific-libfabric-gcc-10)
+	    ("rdma-core",glicid-specific-rdma-core-gcc-10)
 
                   ,@(package-inputs ucx)))
   )
@@ -451,9 +451,11 @@
   (package
     (inherit glicid-openmpi-gcc-10)
     (name "glicid-specific-openmpi-gcc-10")
-      (inputs `(("glicid-specific-rdma-core-gcc-10",glicid-specific-rdma-core-gcc-10)
-       ("glicid-specific-ucx-gcc-10",glicid-specific-ucx-gcc-10)
-       ("glicid-specific-libfabric-gcc-10",glicid-specific-libfabric-gcc-10)
+      (inputs `(
+       ("gcc",gcc-10)
+       ("rdma-core",glicid-specific-rdma-core-gcc-10)
+       ("ucx",glicid-specific-ucx-gcc-10)
+       ("libfabric",glicid-specific-libfabric-gcc-10)
       ,@(package-inputs glicid-openmpi-gcc-10)))
   )
 )
@@ -462,7 +464,7 @@
  (package
   (inherit glicid-intel-mpi-benchmarks)
   (name "glicid-specific-intel-mpi-benchmarks")
-  (inputs `(("glicid-specific-openmpi-gcc-10", glicid-specific-openmpi-gcc-10)  
+  (inputs `(("openmpi", glicid-specific-openmpi-gcc-10)  
                   ,@(package-inputs glicid-intel-mpi-benchmarks)))
   )
 )