Refactor vars and methods to reflect new terminology: "artifact code"