fix zrtp build
Some cleanup of naming to prepare for the next step with spandsp