Bugfix & variable renames
DEPLOY