Follow renamed classes