deprecate old dict syntax and change uses in base and tests