Fix naming
Fix double `toString`