Changed /d/ and /v/ to full-length name