inter cleanup
more naming cleanup