Fixed dict naming