Cleanup for publishing
Minor tweaks and renames for publish