Changed name to Enum, besides in ImageDatabase