Rename classes to improve name consistency