Fix references to constants
Fix reference to _*_screen_init methods
Update measurement screen labels