Use safe controller names for widget and actions

Fixes #23