Fix for renamed class