Replaced .equals() with eclispe generated method.
Removed -Interface suffix and added -Impl suffix for easier object
assignment