changed naming scheme to avoid name collisions