More robust content name system
Attempt to fix content name system
Attempt to fix content name system #2 (DO NOT USE IT)