Fixed deprecated keys... to use the newer route