fix: preserve sub-namespace when generating Entity from Model (i.e., --return entity)

fix: preserve sub-namespace when generating Entity from Model (i.e., --return entity) #15447