normalize names for cleanup