Fixed servicemix confusions throughout project.