Replace depreciated commands