Fixing handling of suffix names closes #31