Fix for Menu Name handling in CPT / CT