some minor name changes .. nothing major