Simpler version namespacing