Usage Question re: scan (TVdb) & folders

My system details:

Code:
]# cat /etc/redhat-release
Fedora release 25 (Twenty Five)
]# rpm -qa | grep -i kodi
kodi-17.1-1.fc25.x86_64

I have most of my videos organized into a heirarchy. All my TV shows are in a directory ./TVShows except for the comics which are under ./TVShows/Comics and organized:
./TVShows/Comics/DC
./TVShows/Comics/Marvel

I also have a source pointed to my ./TVShows directory with the content set as “TV Shows”.

TV shows that are peers of ./Comics are properly identified in via the DB scan:
./TVShows/tv-show-1
./TVShows/tv-show-2

The problem:
./TVShows/Comics is identified as “Comic’s Choice”. I could ignore this because I can just navigate Video – Files – TVShows (the directory) – Comics – DC – etc.

The problem is that KODI identifies all my S01E01 shows under DC and Marvel as “S01E01 Alan Davies” (the 1st episode of Comic’s Choice season 1) and there doesn’t appear to be any way to correct this problem. When I access the context menu it doesn’t offer me the “Information” option to correctly identify anything (e.g. ./Comics/DC/show-1 or ./Comics/DC/show-1/file1.wmv).

Is there a way I can get KODI to correctly identify my videos using a hierarchical directory sturcture to keep what I consider an easy order of directories?

Thanks!

_________________________
For clarity, here’s an example of what I see:

./TVShows (context menu – selecting edit displays content set to “TV Shows”)
./TVShows/BarneyMiller (correctly identified)
./TVShows/HappyDays (correctly identified)
./TVShows/Comics (incorrectly identified as “Comic’s Choice”)
./TVShows/DC (not identified, context menu only offers options to “set content”)
./TVShows/DC/Arrow (unidentified)
./TVShows/DC/Arrow/Arrow.S01E01/1×1 Alan Davies

the last entry (in this example) would actually hold
./TVShows/DC/Arrow/Arrow.S01E01/Arrow.S01E01.wmv (actual file name vs incorrect display name, above)
but appears in KODI as 1×1 Alan Davies (as shown, above)