update containers macro naming