Fixed name usage
Merged in the master changes
About to incorporate ZMP