TOOLS: Fixes to preload and agent control naming