Yes, I'd suggest wake to sleep also.
Also, when she wakes at nite, do you rush in at the first sound? Make sure that you give her time to resettle herself. If she is just making noise/fussing, don't go in! Wait until she cries the "get in here now" cry before you go in, otherwise you are just enforcing her waking, and could turn all those other wakings into habits!