Changed some dictionary names