Added composite hydrator naming strategy