Fix wrong end entity name and implement all generics.
This will create a new commit in order to revert the existing changes.