Fixes "raw" models : 'me', 'org', 'app' and 'entity'