Fix: remove classes previously renamed