refactor: consolidate domain models and name conflixts fix 33937ee alberdjuniawan commited on Dec 11, 2025