Add a lost dep
Properly handle Special names
Add a test for Special names