Fixing names.
Removed RMI.