There are currently references to Newton which should
be Ocata. I've tried to reduce the occurances of this
as much as possible to make it a little more
maintainable. Some of these things need a proper
rewrite to reduce this maintenance burden.
Change-Id: I47ea6258c10da4dbe4be99b6a8b9322c9530ed79