Some renames and globbing additions