Fix container names, hopefully