Renaming things for clarity.
Finished renaming.
Added missed test case. This will cover all varieties of Entity now: Aware/Unaware, Custom Repo / No Custom Repo.