follow-up to rename classes

This is to follow up on commit 6d487a3.