renaming things to make a bit more sense, slight simplification of childOfType