Consistent use of vendor/environment and include paths
Move exceptions to module RQ
Missed an instance of this renamed variable