Names of the procedural classes now use "Hx" instead of "Flx" to avoid confusion.