Improved naming further. I think.