Rename solution
Refactored to support specificly adding tenant singletons.