Renames, add 'auto' to many names...