Hmm... yes, the names are a little confusing. I'll change them.