[TASK] Change variable name to reflect package name