Fix template commands to have correct imports