some cleanups and name changes