Changed a few more org.servalproject occurences