tweaked names some more