I get how tempting it is to stick with a theme, but you're now running full speed into a name collision in the exact same space that you're attempting to work in. It's probably time to let go of that naming convention.