Class rename fix