Made class names consistent.