fixed naming for embedded builder data to force uniqueness