Replace deprecated commands with current equivalents

Change-Id: I871d7f0e5cd0a22a284a6e6733607feafbbb52a2