76608924: rename things due to suggestions