Fixing the org -> com