Fix more duplicate classes