Some naming and printing tweaks