Minor tweaks
Names are required for singletons
Fixed UnlockViewFactory