Improved naming of models

There are no parent, so they are not child
Fixed what needs to be tested when using association with "as"