more generic regex possible
new nameing schemes and names of nameing schemes changed