Fixed problem with NamingStrategy (contribution from Lorenzo Nicora)