Fix Bad Naming - Potential Infinite Loop