updated data model generation with hardcoded namespace aliases