tiny renaming to make some variables unexported