changing names, some tweaks