Class name changes for better understandability