This code is adapted from the NamingStrategy a few lines above. If we change the code here, should we change it there too?