More name modifications and clean up

Moving towards unit tests of being_init