clean up names... sigh