Thanks, I changed to `CATKIN_*_ENVIRONMENT_PATHS` in 655012a