Rename and bit of cleanup on eager_load