diff --git a/apple-mac/Athens_Regular_18.yaff b/apple-mac/Athens_18.yaff
similarity index 100%
rename from apple-mac/Athens_Regular_18.yaff
rename to apple-mac/Athens_18.yaff
diff --git a/apple-mac/Chicago_Regular_12.yaff b/apple-mac/Chicago_12.yaff
similarity index 100%
rename from apple-mac/Chicago_Regular_12.yaff
rename to apple-mac/Chicago_12.yaff
diff --git a/apple-mac/Cream_Regular_10.yaff b/apple-mac/Cream_10.yaff
similarity index 100%
rename from apple-mac/Cream_Regular_10.yaff
rename to apple-mac/Cream_10.yaff
diff --git a/apple-mac/Cream_Regular_12.yaff b/apple-mac/Cream_12.yaff
similarity index 100%
rename from apple-mac/Cream_Regular_12.yaff
rename to apple-mac/Cream_12.yaff
diff --git a/apple-mac/Espy_Sans_Regular_10.yaff b/apple-mac/Espy_Sans_10.yaff
similarity index 100%
rename from apple-mac/Espy_Sans_Regular_10.yaff
rename to apple-mac/Espy_Sans_10.yaff
diff --git a/apple-mac/Espy_Sans_Regular_12.yaff b/apple-mac/Espy_Sans_12.yaff
similarity index 100%
rename from apple-mac/Espy_Sans_Regular_12.yaff
rename to apple-mac/Espy_Sans_12.yaff
diff --git a/apple-mac/Espy_Sans_Regular_14.yaff b/apple-mac/Espy_Sans_14.yaff
similarity index 100%
rename from apple-mac/Espy_Sans_Regular_14.yaff
rename to apple-mac/Espy_Sans_14.yaff
diff --git a/apple-mac/Espy_Sans_Regular_16.yaff b/apple-mac/Espy_Sans_16.yaff
similarity index 100%
rename from apple-mac/Espy_Sans_Regular_16.yaff
rename to apple-mac/Espy_Sans_16.yaff
diff --git a/apple-mac/Espy_Sans_Regular_9.yaff b/apple-mac/Espy_Sans_9.yaff
similarity index 100%
rename from apple-mac/Espy_Sans_Regular_9.yaff
rename to apple-mac/Espy_Sans_9.yaff
diff --git a/apple-mac/Espy_Sans_Bold_Regular_10.yaff b/apple-mac/Espy_Sans_Bold_10.yaff
similarity index 100%
rename from apple-mac/Espy_Sans_Bold_Regular_10.yaff
rename to apple-mac/Espy_Sans_Bold_10.yaff
diff --git a/apple-mac/Espy_Sans_Bold_Regular_12.yaff b/apple-mac/Espy_Sans_Bold_12.yaff
similarity index 100%
rename from apple-mac/Espy_Sans_Bold_Regular_12.yaff
rename to apple-mac/Espy_Sans_Bold_12.yaff
diff --git a/apple-mac/Espy_Sans_Bold_Regular_14.yaff b/apple-mac/Espy_Sans_Bold_14.yaff
similarity index 100%
rename from apple-mac/Espy_Sans_Bold_Regular_14.yaff
rename to apple-mac/Espy_Sans_Bold_14.yaff
diff --git a/apple-mac/Espy_Sans_Bold_Regular_16.yaff b/apple-mac/Espy_Sans_Bold_16.yaff
similarity index 100%
rename from apple-mac/Espy_Sans_Bold_Regular_16.yaff
rename to apple-mac/Espy_Sans_Bold_16.yaff
diff --git a/apple-mac/Espy_Sans_Bold_Regular_9.yaff b/apple-mac/Espy_Sans_Bold_9.yaff
similarity index 100%
rename from apple-mac/Espy_Sans_Bold_Regular_9.yaff
rename to apple-mac/Espy_Sans_Bold_9.yaff
diff --git a/apple-mac/Espy_Serif_Regular_10.yaff b/apple-mac/Espy_Serif_10.yaff
similarity index 100%
rename from apple-mac/Espy_Serif_Regular_10.yaff
rename to apple-mac/Espy_Serif_10.yaff
diff --git a/apple-mac/Espy_Serif_Regular_12.yaff b/apple-mac/Espy_Serif_12.yaff
similarity index 100%
rename from apple-mac/Espy_Serif_Regular_12.yaff
rename to apple-mac/Espy_Serif_12.yaff
diff --git a/apple-mac/Espy_Serif_Regular_14.yaff b/apple-mac/Espy_Serif_14.yaff
similarity index 100%
rename from apple-mac/Espy_Serif_Regular_14.yaff
rename to apple-mac/Espy_Serif_14.yaff
diff --git a/apple-mac/Espy_Serif_Regular_16.yaff b/apple-mac/Espy_Serif_16.yaff
similarity index 100%
rename from apple-mac/Espy_Serif_Regular_16.yaff
rename to apple-mac/Espy_Serif_16.yaff
diff --git a/apple-mac/Espy_Serif_Bold_Regular_10.yaff b/apple-mac/Espy_Serif_Bold_10.yaff
similarity index 100%
rename from apple-mac/Espy_Serif_Bold_Regular_10.yaff
rename to apple-mac/Espy_Serif_Bold_10.yaff
diff --git a/apple-mac/Espy_Serif_Bold_Regular_12.yaff b/apple-mac/Espy_Serif_Bold_12.yaff
similarity index 100%
rename from apple-mac/Espy_Serif_Bold_Regular_12.yaff
rename to apple-mac/Espy_Serif_Bold_12.yaff
diff --git a/apple-mac/Espy_Serif_Bold_Regular_14.yaff b/apple-mac/Espy_Serif_Bold_14.yaff
similarity index 100%
rename from apple-mac/Espy_Serif_Bold_Regular_14.yaff
rename to apple-mac/Espy_Serif_Bold_14.yaff
diff --git a/apple-mac/Espy_Serif_Bold_Regular_16.yaff b/apple-mac/Espy_Serif_Bold_16.yaff
similarity index 100%
rename from apple-mac/Espy_Serif_Bold_Regular_16.yaff
rename to apple-mac/Espy_Serif_Bold_16.yaff
diff --git a/apple-mac/Gacha_Regular_6x12.yaff b/apple-mac/Gacha_6x12.yaff
similarity index 100%
rename from apple-mac/Gacha_Regular_6x12.yaff
rename to apple-mac/Gacha_6x12.yaff
diff --git a/apple-mac/Gacha_Regular_6x9.yaff b/apple-mac/Gacha_6x9.yaff
similarity index 100%
rename from apple-mac/Gacha_Regular_6x9.yaff
rename to apple-mac/Gacha_6x9.yaff
diff --git a/apple-mac/Gacha_Regular_7x13.yaff b/apple-mac/Gacha_7x13.yaff
similarity index 100%
rename from apple-mac/Gacha_Regular_7x13.yaff
rename to apple-mac/Gacha_7x13.yaff
diff --git a/apple-mac/Geneva_Regular_10.yaff b/apple-mac/Geneva_10.yaff
similarity index 100%
rename from apple-mac/Geneva_Regular_10.yaff
rename to apple-mac/Geneva_10.yaff
diff --git a/apple-mac/Geneva_Regular_12.yaff b/apple-mac/Geneva_12.yaff
similarity index 100%
rename from apple-mac/Geneva_Regular_12.yaff
rename to apple-mac/Geneva_12.yaff
diff --git a/apple-mac/Geneva_Regular_14.yaff b/apple-mac/Geneva_14.yaff
similarity index 100%
rename from apple-mac/Geneva_Regular_14.yaff
rename to apple-mac/Geneva_14.yaff
diff --git a/apple-mac/Geneva_Regular_18.yaff b/apple-mac/Geneva_18.yaff
similarity index 100%
rename from apple-mac/Geneva_Regular_18.yaff
rename to apple-mac/Geneva_18.yaff
diff --git a/apple-mac/Geneva_Regular_24.yaff b/apple-mac/Geneva_24.yaff
similarity index 100%
rename from apple-mac/Geneva_Regular_24.yaff
rename to apple-mac/Geneva_24.yaff
diff --git a/apple-mac/Geneva_Regular_9.yaff b/apple-mac/Geneva_9.yaff
similarity index 100%
rename from apple-mac/Geneva_Regular_9.yaff
rename to apple-mac/Geneva_9.yaff
diff --git a/apple-mac/London_Regular_18.yaff b/apple-mac/London_18.yaff
similarity index 100%
rename from apple-mac/London_Regular_18.yaff
rename to apple-mac/London_18.yaff
diff --git a/apple-mac/Los_Angeles_Regular_12.yaff b/apple-mac/Los_Angeles_12.yaff
similarity index 100%
rename from apple-mac/Los_Angeles_Regular_12.yaff
rename to apple-mac/Los_Angeles_12.yaff
diff --git a/apple-mac/Los_Angeles_Regular_24.yaff b/apple-mac/Los_Angeles_24.yaff
similarity index 100%
rename from apple-mac/Los_Angeles_Regular_24.yaff
rename to apple-mac/Los_Angeles_24.yaff
diff --git a/apple-mac/Mobile_Regular_18.yaff b/apple-mac/Mobile_18.yaff
similarity index 100%
rename from apple-mac/Mobile_Regular_18.yaff
rename to apple-mac/Mobile_18.yaff
diff --git a/apple-mac/Monaco_Regular_6x11.yaff b/apple-mac/Monaco_6x11.yaff
similarity index 100%
rename from apple-mac/Monaco_Regular_6x11.yaff
rename to apple-mac/Monaco_6x11.yaff
diff --git a/apple-mac/Monaco_Regular_6x16.yaff b/apple-mac/Monaco_6x16.yaff
similarity index 100%
rename from apple-mac/Monaco_Regular_6x16.yaff
rename to apple-mac/Monaco_6x16.yaff
diff --git a/apple-mac/Monaco_Regular_7x16.yaff b/apple-mac/Monaco_7x16.yaff
similarity index 100%
rename from apple-mac/Monaco_Regular_7x16.yaff
rename to apple-mac/Monaco_7x16.yaff
diff --git a/apple-mac/New_York_Regular_10.yaff b/apple-mac/New_York_10.yaff
similarity index 100%
rename from apple-mac/New_York_Regular_10.yaff
rename to apple-mac/New_York_10.yaff
diff --git a/apple-mac/New_York_Regular_12.yaff b/apple-mac/New_York_12.yaff
similarity index 100%
rename from apple-mac/New_York_Regular_12.yaff
rename to apple-mac/New_York_12.yaff
diff --git a/apple-mac/New_York_Regular_14.yaff b/apple-mac/New_York_14.yaff
similarity index 100%
rename from apple-mac/New_York_Regular_14.yaff
rename to apple-mac/New_York_14.yaff
diff --git a/apple-mac/New_York_Regular_18.yaff b/apple-mac/New_York_18.yaff
similarity index 100%
rename from apple-mac/New_York_Regular_18.yaff
rename to apple-mac/New_York_18.yaff
diff --git a/apple-mac/New_York_Regular_24.yaff b/apple-mac/New_York_24.yaff
similarity index 100%
rename from apple-mac/New_York_Regular_24.yaff
rename to apple-mac/New_York_24.yaff
diff --git a/apple-mac/New_York_Regular_36.yaff b/apple-mac/New_York_36.yaff
similarity index 100%
rename from apple-mac/New_York_Regular_36.yaff
rename to apple-mac/New_York_36.yaff
diff --git a/apple-mac/New_York_Regular_9.yaff b/apple-mac/New_York_9.yaff
similarity index 100%
rename from apple-mac/New_York_Regular_9.yaff
rename to apple-mac/New_York_9.yaff
diff --git a/apple-mac/Palatino_Regular_10.yaff b/apple-mac/Palatino_10.yaff
similarity index 100%
rename from apple-mac/Palatino_Regular_10.yaff
rename to apple-mac/Palatino_10.yaff
diff --git a/apple-mac/Palatino_Regular_12.yaff b/apple-mac/Palatino_12.yaff
similarity index 100%
rename from apple-mac/Palatino_Regular_12.yaff
rename to apple-mac/Palatino_12.yaff
diff --git a/apple-mac/Palatino_Regular_14.yaff b/apple-mac/Palatino_14.yaff
similarity index 100%
rename from apple-mac/Palatino_Regular_14.yaff
rename to apple-mac/Palatino_14.yaff
diff --git a/apple-mac/Palatino_Regular_18.yaff b/apple-mac/Palatino_18.yaff
similarity index 100%
rename from apple-mac/Palatino_Regular_18.yaff
rename to apple-mac/Palatino_18.yaff
diff --git a/apple-mac/Palatino_Regular_24.yaff b/apple-mac/Palatino_24.yaff
similarity index 100%
rename from apple-mac/Palatino_Regular_24.yaff
rename to apple-mac/Palatino_24.yaff
diff --git a/apple-mac/San_Francisco_Regular_18.yaff b/apple-mac/San_Francisco_18.yaff
similarity index 100%
rename from apple-mac/San_Francisco_Regular_18.yaff
rename to apple-mac/San_Francisco_18.yaff
diff --git a/apple-mac/System_Regular_12.yaff b/apple-mac/System_12.yaff
similarity index 100%
rename from apple-mac/System_Regular_12.yaff
rename to apple-mac/System_12.yaff
diff --git a/apple-mac/Toronto_Regular_12.yaff b/apple-mac/Toronto_12.yaff
similarity index 100%
rename from apple-mac/Toronto_Regular_12.yaff
rename to apple-mac/Toronto_12.yaff
diff --git a/apple-mac/Toronto_Regular_14.yaff b/apple-mac/Toronto_14.yaff
similarity index 100%
rename from apple-mac/Toronto_Regular_14.yaff
rename to apple-mac/Toronto_14.yaff
diff --git a/apple-mac/Toronto_Regular_18.yaff b/apple-mac/Toronto_18.yaff
similarity index 100%
rename from apple-mac/Toronto_Regular_18.yaff
rename to apple-mac/Toronto_18.yaff
diff --git a/apple-mac/Toronto_Regular_24.yaff b/apple-mac/Toronto_24.yaff
similarity index 100%
rename from apple-mac/Toronto_Regular_24.yaff
rename to apple-mac/Toronto_24.yaff
diff --git a/apple-mac/Toronto_Regular_9.yaff b/apple-mac/Toronto_9.yaff
similarity index 100%
rename from apple-mac/Toronto_Regular_9.yaff
rename to apple-mac/Toronto_9.yaff
diff --git a/apple-mac/Venice_Regular_14.yaff b/apple-mac/Venice_14.yaff
similarity index 100%
rename from apple-mac/Venice_Regular_14.yaff
rename to apple-mac/Venice_14.yaff