Support for {tableName}{Id} naming convention + tests