UHM-1161 - Rename exports to consistent naming convention