Change variable naming convention for components in UITest.
Remove old TODO.