Rename method calls in EntityManagerWrapper, see Issue #1976158