#1746 - implement name changes requested by Javier
Merge pull request #1762 from OCHA-DAP/arti-sprint-39

#1746 - implement name changes requested by Javier
Merge pull request #1763 from OCHA-DAP/dev

Dev into Stag