Once you have naming fully corrected, you may want try the procedure outlined below to ensure PMS fully re-scans/analyzes the new structure: