Resolving name shadowing, replacing old-style docklets, etc