Not a huge fan of the new naming.  You'll need to change the method names to match if you want to change it this way.