This week's book giveaway is in the OCPJP forum. We're giving away four copies of OCA/OCP Java SE 7 Programmer I & II Study Guide and have Kathy Sierra & Bert Bates on-line! See this thread for details.
JNDI is for both Java Naming and Directory Services. We don't typically separate the two in discussions. I'm guessing naming is the lookup part and directory is the storage part. But it wouldn't make sense to have just one.