Make naming scheme follow the path names instead