[Issue #21] Renaming shared -> singleton