boost names cleanup