Use class_name method in more places, less hard coding