Updated variable refs and SQL statements to account for other change in cdt-stage