Added some helper funtions to `Naming` instead of calling `quoteIfJavaKeyword()` directly (#1658)