Minor rename; printing tweaks