Fix Plane naming conflicts, some syntax errors.