refactor names for Container pattern