Yeah. I've changed all the names so many times already that I have it pretty mixed up myself. I don't see why the current set of names seems not consistent but I leave that to you :). For me either is fine.