File Entity class name change to FileEntity to avoid name conflicts