renames and tweaks