@Peter Kellner At the moment that is correct, there isn't an option to have that happen automatically. I had a similar problem with tons (50+) of tables on a large application I was working on. I ended up just fixing naming conventions as I needed specific tables and columns