Reimporting names and fixing up admin stuff