cleanup container names