small naming cleanup