Working through JPA OMR test case and cleaning up interface naming