renamed functions according to previous commit