And another cleanup and some name changes