Rename everything and hide the enumerator interface.