rename some more stuff for clarity