diff --git a/pymacro/macros b/pymacro/macros
index 504fb9b..34f0758 100644
--- a/pymacro/macros
+++ b/pymacro/macros
@@ -1,5 +1,5 @@
 .hc hydrocarbon
-.h hydrogen
-.c carbon
-.o	oxygen
+.hy hydrogen
+.ca carbon
+.ox	oxygen
 :wink:	😉
diff --git a/pymacro/tests/test_input b/pymacro/tests/test_input
index 8868ec3..a9a116e 100644
--- a/pymacro/tests/test_input
+++ b/pymacro/tests/test_input
@@ -1,12 +1,12 @@
-.Hcs are composed of exclusively .h and .c.
+.Hcs are composed of exclusively .hy and .ca.
 
 .Chl is the site of .ps.
 
 :wink:
 
 1 .hc 2 .hcs
-1 .d 2 .ds
-1 .s 2 .ss
+1 .dr 2 .drs
+1 .st 2 .sts
 1 .he 2 .hes
-1 .l 2 .ls
-1 .m 2 .ms
+1 .le 2 .les
+1 .ma 2 .mas
diff --git a/pymacro/tests/test_macros_plural b/pymacro/tests/test_macros_plural
index 3e4e5fd..80b1b34 100644
--- a/pymacro/tests/test_macros_plural
+++ b/pymacro/tests/test_macros_plural
@@ -1,6 +1,6 @@
 .hc	hydrocarbon
-.d	dress
-.s	story
+.dr	dress
+.st	story
 .he	hero
-.l	leaf
-.m	man	men
+.le	leaf
+.ma	man	men