rDCS1c79da89754d

updated to net7. Fixed some naming conventions which violate our rules