Pre-append _ in case conflict with repo name
Data re-structure