Match name of task to new tool name

Signed-off-by: David Zafman <david.zafman@inktank.com>
Complete matching of task name to new tool name

Signed-off-by: David Zafman <david.zafman@inktank.com>
Put space separator in the prefix
Fix import verification