use more explicit naming to prevent name clashes. fixes build.