diff --git a/packages/gcc/10.2.0/compile b/packages/gcc/10.2.0/compile
index 8ef8ec5..c2957d8 100644
--- a/packages/gcc/10.2.0/compile
+++ b/packages/gcc/10.2.0/compile
@@ -3,21 +3,21 @@
 # Put instructions to compile source code, remove this file if the language does not require this stage
 
 
-case "${PISTON_ALIAS}" in
-    gcc | c)
+case "${PISTON_LANGUAGE}" in
+    c)
         rename 's/$/\.c/' "$@" # Add .c extension
         gcc -std=c11 *.c -lm
         ;;
-    g++ | c++ | cpp)
+    c++)
         rename 's/$/\.cpp/' "$@" # Add .cpp extension
         g++ -std=c++17 *.cpp
         ;;
-    gdc | d)
+    d)
         rename 's/$/\.d/' "$@" # Add .d extension
         gdc *.d
         ;;
     *)
-        echo "How did you get here? (${PISTON_ALIAS})"
+        echo "How did you get here? (${PISTON_LANGUAGE})"
         exit 1
         ;;
 esac
diff --git a/packages/gcc/10.2.0/metadata.json b/packages/gcc/10.2.0/metadata.json
index 6e211f6..800e652 100644
--- a/packages/gcc/10.2.0/metadata.json
+++ b/packages/gcc/10.2.0/metadata.json
@@ -1,5 +1,18 @@
 {
     "language": "gcc",
     "version": "10.2.0",
-    "aliases": ["c", "g++", "c++", "cpp", "gdc", "d"]
+    "provides": [
+        {
+            "language":"c",
+            "aliases": ["gcc"]
+        },
+        {
+            "language": "c++",
+            "aliases": ["cpp", "g++"]
+        },
+        {
+            "language": "d",
+            "aliases": ["gdc"]
+        }
+    ]
 }
diff --git a/packages/nasm/2.15.5/compile b/packages/nasm/2.15.5/compile
index e481319..f133a67 100644
--- a/packages/nasm/2.15.5/compile
+++ b/packages/nasm/2.15.5/compile
@@ -3,7 +3,7 @@
 # Put instructions to compile source code, remove this file if the language does not require this stage
 
 
-case "${PISTON_ALIAS}" in
+case "${PISTON_LANGUAGE}" in
     nasm)
         nasm -f elf32 -o binary.o "$@"
         ld -m elf_i386 binary.o -o binary
@@ -13,7 +13,7 @@ case "${PISTON_ALIAS}" in
         ld -m elf_x86_64 binary.o -o binary
         ;;
     *)
-        echo "How did you get here? (${PISTON_ALIAS})"
+        echo "How did you get here? (${PISTON_LANGUAGE})"
         exit 1
         ;;
 esac
diff --git a/packages/nasm/2.15.5/metadata.json b/packages/nasm/2.15.5/metadata.json
index 9f8a384..80a5150 100644
--- a/packages/nasm/2.15.5/metadata.json
+++ b/packages/nasm/2.15.5/metadata.json
@@ -1,5 +1,14 @@
 {
     "language": "nasm",
     "version": "2.15.5",
-    "aliases": ["nasm64"]
+    "provides": [
+        {
+            "language": "nasm",
+            "aliases": ["asm", "nasm32"]
+        },
+        {
+            "language": "nasm64",
+            "aliases": ["asm64"]
+        }
+    ]
 }
diff --git a/packages/node/15.10.0/metadata.json b/packages/node/15.10.0/metadata.json
index 2f601d1..3675016 100644
--- a/packages/node/15.10.0/metadata.json
+++ b/packages/node/15.10.0/metadata.json
@@ -1,5 +1,10 @@
 {
     "language": "node",
     "version": "15.10.0",
-    "aliases": ["node-javascript", "node-js", "javascript", "js"]
+    "provides": [
+        {
+            "language": "javascript",
+            "aliases": ["node-javascript", "node-js", "javascript", "js"]
+        }
+    ]
 }