Updating for current instructions and naming.