Improved container names