Holly has not given up all naps; just her afternoon one. As in, she still takes a pretty long morning nap. However, it's still a nightmare in the evenings because she is awake for far too many hours before bedtime!
So we are working on pushing her morning nap back slowly. Very slowly. She gets cranky if I keep her up too long in the morning, so it's a balancing act. We'll get there!