Update WavTop for new naming conventions
Merge pull request #1648 from Cottser/wavtap

Update WavTop for new naming conventions