Follow through on class name change