Rename some lists, funcs, cosmetics