ApiCLI: now also fix incorrect namespaces

with doing so, we can get rid of Janchas fix in Model and Model_Table and hope that this will help us somewhere else too :)