Add more special name handling