Use more conventional variable names in slave containers