changed naming. I like this better