Some name changes and misc. tidying