rename/comment tweaks