Fixing jpa dependencies and renaming