changed some private names