Refactor with container names