cleanup: remove _ suffixes now that names can no longer collide