acu150736 restore old class names for 1.5.9 compat