Use underscore in instance name. Closes #58