Make class name variables consistent