Minor clean-up and renames