Replace deprecated members with new version