Clean up container names