Re-order LPS-47690 Registry-fy ScreenNameGenerator/Validator from OSGI