rename some stuff for clarity