update to use current SDK module names (SDK 1.16)