Change naming, add regex field detection, add test cases for fields