Finished updated renaming.  Now all actors use the right interfaces and have the right names