naming and other tweaks