Renaming: entity for instance

Heavy renaming. All instance are being renamed to entity.