OK, as she goes to sleep independantly for bedtime and naps without rocking, she could be waking just for you to rock her, so you need to break this habit. Try an earlier bedtime of about 15-30mins to ensure that she isn't overtired and when she wakes I would do WIWO until she falls to sleep. She might resist it as she is now used to being rocked but she should catch on soon enough if she is able to go to sleep without being rocked at bedtime.
Good luck