Fix a few entitiy names. Remove redundant entity for file uploads