Renaming and cleanup in entity view ext
Cleanup in entity view ext