Fix vtl identifiers